commit 2d817309e07d1e5d7eb7c6e2546c0e6793c53739 Merge: 5ba1b34 2ae052b Author: Mike Perry mikeperry-git@torproject.org Date: Tue Jul 28 01:37:07 2015 -0700
Merge remote-tracking branch 'arthur/16429+11' into tor-browser-38.1.0esr-5.0-1
.../pdfjs/content/PdfStreamConverter.jsm | 7 +- .../extensions/pdfjs/content/build/pdf.worker.js | 9 +- dom/base/ThirdPartyUtil.cpp | 30 ++- dom/base/ThirdPartyUtil.h | 12 + dom/base/URL.cpp | 32 ++- dom/base/moz.build | 1 + dom/base/nsDocument.cpp | 17 +- dom/base/nsHostObjectProtocolHandler.cpp | 125 +++++----- dom/base/nsHostObjectProtocolHandler.h | 15 +- dom/base/test/bug15502_page_blobify.html | 3 +- dom/base/test/bug15502_page_deblobify.html | 3 +- dom/base/test/bug15502_tab.html | 5 +- dom/base/test/bug15502_utils.js | 15 +- dom/base/test/bug15502_worker_blobify.html | 3 +- dom/base/test/bug15502_worker_deblobify.html | 3 +- dom/base/test/bug15703_page_create.html | 28 +++ dom/base/test/bug15703_page_retrieve.html | 50 ++++ dom/base/test/mochitest.ini | 3 + dom/base/test/test_tor_bug15502.html | 33 ++- dom/base/test/test_tor_bug15703.html | 92 ++++++++ dom/fetch/Fetch.cpp | 17 +- dom/fetch/FetchDriver.cpp | 8 +- dom/fetch/FetchDriver.h | 5 +- dom/html/HTMLMediaElement.cpp | 17 +- dom/media/MediaResource.cpp | 6 +- dom/workers/URL.cpp | 28 ++- dom/workers/WorkerPrivate.cpp | 22 +- netwerk/base/mozIThirdPartyUtil.idl | 14 -- testing/mochitest/chrome/chrome.ini | 1 + testing/mochitest/chrome/test_sanitySpawnTask.xul | 70 ++++++ testing/mochitest/jar.mn | 1 + .../mochitest/tests/Harness_sanity/mochitest.ini | 2 +- .../tests/Harness_sanity/test_spawn_task.html | 73 ++++++ .../mochitest/tests/SimpleTest/LICENSE_SpawnTask | 24 ++ testing/mochitest/tests/SimpleTest/SpawnTask.js | 244 ++++++++++++++++++++ testing/mochitest/tests/SimpleTest/moz.build | 1 + 36 files changed, 848 insertions(+), 171 deletions(-)