- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/13313+4'
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 08b05d52c58c03e1a0c712dc64845185e53abe37 Merge: 83e881b bdc340e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:09:10 2015 +0000 Merge remote-tracking branch 'arthur/13313+4' Bundle-Data/Docs/Licenses/Noto-CJK-Font.txt | 92 +++++++++++ Bundle-Data/Docs/Licenses/Noto-Fonts.txt | 201 +++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 15 ++ gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 15 ++ gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 15 ++ gitian/descriptors/windows/gitian-firefox.yml | 2 +- gitian/fetch-inputs.sh | 5 +- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 3 +- gitian/versions | 5 + gitian/versions.alpha | 5 + gitian/versions.beta | 5 + gitian/versions.nightly | 5 + 17 files changed, 369 insertions(+), 9 deletions(-)

1 0

[tor-browser-bundle/master] Add --enable-bundled-fonts to firefox config.
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit b2f9648ada10c5f9eb0dd093928bfd4919d76f51 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 31 20:21:51 2014 +0000 Add --enable-bundled-fonts to firefox config. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 05b2beb..1efed90 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -110,7 +110,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12461 comment 8 and later. Additionally, we need to avoid diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e8f1046..8b85b5a 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c7efb62..7358922 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -86,7 +86,7 @@ script: | # that feature it would hang sometimes for unknown but to libfaketime related # reasons. export LD_PRELOAD="" - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[torbutton/master] Bug 16268: Taking lower-case into account
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 03cf87e2a76d15016703de631ca5140e42fdb1f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 17:01:55 2015 +0000 Bug 16268: Taking lower-case into account Patch by Pearl Crescent --- trans_tools/import-translations.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 28816ff..ae686b4 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -66,18 +66,24 @@ fi echo "Locales: $BUNDLE_LOCALES" cd translation for KEYVAL in "${FILEMAP[@]}"; do - FILE="${KEYVAL%%:*}" + DEST_FILE="${KEYVAL%%:*}" BRANCH="${KEYVAL##*:}" - echo "Updating ${FILE}..." + echo "Updating ${DEST_FILE}..." git checkout -q "$BRANCH" git merge -q origin/"$BRANCH" for i in $BUNDLE_LOCALES; do UL="`echo $i|tr - _`" mkdir -p ../$LOCALE_DIR/$i/ +# Some file names are lowercase in Transifex. + if [ -f $UL/"$DEST_FILE" ]; then + SRCFILE="$DEST_FILE" + else + SRCFILE="`echo $DEST_FILE | tr '[:upper:]' '[:lower:]'`" + fi # Use sed to work around a Transifex "double entity" issue. sed -e 's/\&brandShortName;/\&brandShortName;/g' \ -e 's/\&vendorShortName;/\&vendorShortName;/g' \ - $UL/"$FILE" > ../$LOCALE_DIR/$i/"$FILE" + $UL/"$SRCFILE" > ../$LOCALE_DIR/$i/"$DEST_FILE" done done

1 0

[tor-browser-bundle/master] Adding new subkeys to gk's key
by gk＠torproject.org 28 Jul '15

28 Jul '15

commit 83e881b69a286c9d1e1c33f7522bb1ad9681b6f2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 28 15:59:40 2015 +0000 Adding new subkeys to gk's key --- gitian/gpg/gk.gpg | Bin 11926 -> 33866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 9923c96..ad731ca 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Enable meek-http-helper prefs that make the ALPN extension match.
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 276e390fbd0aa2449675c55a477f337a0f2b78df Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 24 10:07:38 2015 +0000 Enable meek-http-helper prefs that make the ALPN extension match. https://trac.torproject.org/projects/tor/ticket/15512#comment:3 --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 23565d9..de2355c 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -9,6 +9,14 @@ user_pref("browser.dom.window.dump.enabled", true); // https://trac.torproject.org/projects/tor/ticket/13442#comment:1 user_pref("security.ssl.disable_session_identifiers", false); +// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN +// extension. +// https://trac.torproject.org/projects/tor/ticket/15512 +user_pref("network.http.spdy.enabled", true); +user_pref("network.http.spdy.enabled.http2", true); +user_pref("network.http.spdy.enabled.http2draft", true); +user_pref("network.http.spdy.enabled.v3-1", true); + // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 0396e4f834a31ec0cc7b9c4b853417891a09c43c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 27 17:17:15 2015 -0700 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/events/KeyCodeConsensus.h | 9 +++++++-- dom/events/KeyboardEvent.cpp | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h index 5493c36..53ec7f6 100644 --- a/dom/events/KeyCodeConsensus.h +++ b/dom/events/KeyCodeConsensus.h @@ -5,14 +5,15 @@ #include "nsString.h" #include "nsDataHashtable.h" +#include "mozilla/StaticMutex.h" // KEY_INTERNAL is called by KEY or SHIFT. -#define KEY_INTERNAL(key, code, keyCode, shift) \ +#define KEY_INTERNAL(key, code, keyCode, shift) \ gCodes->Put(NS_LITERAL_STRING(key), NS_LITERAL_STRING(#code)); \ gKeyCodes->Put(NS_LITERAL_STRING(key), keyCode); \ gShiftStates->Put(NS_LITERAL_STRING(key), shift); -// KEY and SHIFT Assign a consensus codeName and keyCode for the given keyName. +// KEY and SHIFT assign a consensus codeName and keyCode for the given keyName. // KEY indicates that shift is off. #define KEY(key, code, keyCode) KEY_INTERNAL(key, code, keyCode, false) // SHIFT indicates that shift is on. @@ -26,12 +27,16 @@ static nsDataHashtable<nsStringHashKey, uint32_t>* gKeyCodes; // gShiftStates provides a shift value for each keyName. static nsDataHashtable<nsStringHashKey, bool>* gShiftStates; +static StaticMutex createKeyCodesMutex; + // Populate the global static maps gCodes, gKeCodes, gShiftStates // with their constant values. static void createKeyCodes() { if (gCodes) return; + StaticMutexAutoLock lock(createKeyCodesMutex); + gCodes = new nsDataHashtable<nsStringHashKey, nsString>(); gKeyCodes = new nsDataHashtable<nsStringHashKey, uint32_t>(); gShiftStates = new nsDataHashtable<nsStringHashKey, bool>(); diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp index 8829b8f..76e6e39 100644 --- a/dom/events/KeyboardEvent.cpp +++ b/dom/events/KeyboardEvent.cpp @@ -46,7 +46,15 @@ NS_INTERFACE_MAP_END_INHERITING(UIEvent) bool KeyboardEvent::AltKey() { - return mEvent->AsKeyboardEvent()->IsAlt(); + bool altState = mEvent->AsKeyboardEvent()->IsAlt(); + if (ResistFingerprinting()) { + nsString keyName; + GetKey(keyName); + bool exists = gCodes->Get(keyName, nullptr); + return exists ? false : altState; + } else { + return altState; + } } NS_IMETHODIMP

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 8422662a5b8771b6e93a02e4cb6895ff1d8a3126 Merge: 2d81730 0396e4f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 28 07:30:10 2015 -0700 Merge remote-tracking branch 'arthur/15646+2' into tor-browser-38.1.0esr-5.0-1 dom/events/KeyCodeConsensus.h | 9 +++++++-- dom/events/KeyboardEvent.cpp | 10 +++++++++- 2 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Revert "Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers"
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit b4d97bc75ff672725fd80e0c640748a74c6edc3e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 2 12:54:18 2015 -0700 Revert "Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers" This reverts commit 7a8d11b1ef502688c97d7900c57361c4be6ae13a. --- .../pdfjs/content/PdfStreamConverter.jsm | 7 +----- .../extensions/pdfjs/content/build/pdf.worker.js | 9 +------- dom/base/ThirdPartyUtil.cpp | 9 -------- dom/base/nsHostObjectProtocolHandler.cpp | 23 ++------------------ dom/workers/URL.cpp | 7 ------ netwerk/base/mozIThirdPartyUtil.idl | 14 ------------ 6 files changed, 4 insertions(+), 65 deletions(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index 26515be..11db211 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,12 +250,6 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; - var netChannel; - try { - netChannel = NetUtil.newChannel(blobUri); - } catch (e) { - netChannel = NetUtil.newChannel(originalUri); - } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -263,6 +257,7 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); + var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate); diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js index a5dfe2f..c9de2ea 100644 --- a/browser/extensions/pdfjs/content/build/pdf.worker.js +++ b/browser/extensions/pdfjs/content/build/pdf.worker.js @@ -1152,14 +1152,7 @@ PDFJS.createObjectURL = (function createObjectURLClosure() { if (!PDFJS.disableCreateObjectURL && typeof URL !== 'undefined' && URL.createObjectURL) { var blob = PDFJS.createBlob(data, contentType); - try { - return URL.createObjectURL(blob); - } catch(e) { - // URL.createObjectURL has thrown an error; continue to - // data schema fallback. - // TODO: Remove this try-catch when we re-enable - // createObjectURL in workers. - } + return URL.createObjectURL(blob); } var buffer = 'data:' + contentType + ';base64,'; diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index eb09b43..d0aed3a 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -746,12 +746,3 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, aHost.Append("--"); return NS_OK; } - -NS_IMETHODIMP -ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString& aHost) { - nsCOMPtr<nsIURI> uri; - nsresult rv = GetFirstPartyIsolationURI(nullptr, - nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri)); - NS_ENSURE_SUCCESS(rv, rv); - return GetFirstPartyHostForIsolation(uri, aHost); -} diff --git a/dom/base/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp index 8c440f4..aac33f9 100644 --- a/dom/base/nsHostObjectProtocolHandler.cpp +++ b/dom/base/nsHostObjectProtocolHandler.cpp @@ -16,7 +16,6 @@ #include "mozilla/dom/File.h" #include "mozilla/Preferences.h" #include "mozilla/LoadInfo.h" -#include "mozIThirdPartyUtil.h" using mozilla::dom::FileImpl; using mozilla::ErrorResult; @@ -30,20 +29,9 @@ struct DataInfo nsCOMPtr<nsISupports> mObject; nsCOMPtr<nsIPrincipal> mPrincipal; nsCString mStack; - nsCString mFirstPartyHost; }; static nsClassHashtable<nsCStringHashKey, DataInfo>* gDataTable; -static nsCOMPtr<mozIThirdPartyUtil> gThirdPartyUtilService; - -static nsCString GetFirstPartyHostFromCaller() { - if (!gThirdPartyUtilService) { - gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID); - } - nsCString host; - gThirdPartyUtilService->GetFirstPartyHostFromCaller(host); - return host; -} // Memory reporting for the hash table. namespace mozilla { @@ -325,8 +313,6 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString& aScheme, info->mObject = aObject; info->mPrincipal = aPrincipal; - // Record the first party host that originated this object. - info->mFirstPartyHost = GetFirstPartyHostFromCaller(); mozilla::BlobURLsReporter::GetJSStackForBlob(info); gDataTable->Put(aUri, info); @@ -451,10 +437,7 @@ GetDataObject(nsIURI* aURI) aURI->GetSpec(spec); DataInfo* info = GetDataInfo(spec); - // Deny access to this object if the current first-party host - // doesn't match the originating first-party host. - return (info && info->mFirstPartyHost == GetFirstPartyHostFromCaller()) - ? info->mObject : nullptr; + return info ? info->mObject : nullptr; } // ----------------------------------------------------------------------- @@ -512,9 +495,7 @@ nsHostObjectProtocolHandler::NewChannel2(nsIURI* uri, DataInfo* info = GetDataInfo(spec); - // Deny access to this URI if the current first party host - // doesn't match the first party host when it was created. - if (!info || (info->mFirstPartyHost != GetFirstPartyHostFromCaller())) { + if (!info) { return NS_ERROR_DOM_BAD_URI; } diff --git a/dom/workers/URL.cpp b/dom/workers/URL.cpp index 2ad1276..fbf6987 100644 --- a/dom/workers/URL.cpp +++ b/dom/workers/URL.cpp @@ -889,13 +889,6 @@ URL::CreateObjectURL(const GlobalObject& aGlobal, File& aBlob, JSContext* cx = aGlobal.Context(); WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(cx); - if (!workerPrivate->IsChromeWorker()) { - workerPrivate->ReportError(cx, "Worker attempted to use createObjectURL; denied.", nullptr); - NS_NAMED_LITERAL_STRING(argStr, "URL.createObjectURL"); - aRv.ThrowTypeError(MSG_METHOD_THIS_UNWRAPPING_DENIED, &argStr); - return; - } - nsRefPtr<FileImpl> blobImpl = aBlob.Impl(); MOZ_ASSERT(blobImpl); diff --git a/netwerk/base/mozIThirdPartyUtil.idl b/netwerk/base/mozIThirdPartyUtil.idl index a06841d..68a7099 100644 --- a/netwerk/base/mozIThirdPartyUtil.idl +++ b/netwerk/base/mozIThirdPartyUtil.idl @@ -262,20 +262,6 @@ interface mozIThirdPartyUtil : nsISupports */ AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI); - /** - * getFirstPartyHostFromCaller - * - * Obtain the host or pseudo-host for the first party URI belonging - * to the calling document. See getFirstPartyHostForIsolation(...) for - * examples. - * - * @return host or pseudo host. - * - * @throws if the calling document's first party URI lacks a host - * and the scheme is not a whitelisted one for which we - * generate a pseudo host. - */ - AUTF8String getFirstPartyHostFromCaller(); }; %{ C++

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug #15502, Part 2: Regression tests for blob URL isolation
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 4ef8f72964d1608a9ded427137d66547f78d71b8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jul 2 12:26:40 2015 -0700 fixup! Bug #15502, Part 2: Regression tests for blob URL isolation --- dom/base/test/test_tor_bug15502.html | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dom/base/test/test_tor_bug15502.html b/dom/base/test/test_tor_bug15502.html index 18b8459..05173d9 100644 --- a/dom/base/test/test_tor_bug15502.html +++ b/dom/base/test/test_tor_bug15502.html @@ -59,20 +59,10 @@ let blobTest = function* (isolationOn, domainA, domainB, blobPage, deblobPage) { blobURL = yield tabIO(domainA, blobPage, input), result = yield tabIO(domainB, deblobPage, blobURL), description = domainA + ":" + blobPage + "->" + domainB + ":" + deblobPage + ", isolation " + (isolationOn ? "on." : "off."); - if (blobPage === worker_blob) { - // Remove this case when we write a patch that properly isolates web worker blob URLs - // by first party domain. - ok(blobURL.contains("Permission to call 'URL.createObjectURL' denied."), description + " Deny blob URL creation in web worker"); - } else if (deblobPage === worker_deblob && isolationOn) { - // Remove this case when we write a patch that properly isolates web worker blob URLs - // by first party domain. - ok(result.contains("Access to restricted URI denied"), description + " Isolated blobs not available to web workers"); + if (isolationOn && domainA !== domainB) { + ok(input !== result, description + " Deny retrieval"); } else { - if (isolationOn && domainA !== domainB) { - ok(input !== result, description + " Deny retrieval"); - } else { - ok(input === result, description + " Allow retrieval"); - } + ok(input === result, description + " Allow retrieval"); } };

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/16429+11' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 28 Jul '15

28 Jul '15

commit 2d817309e07d1e5d7eb7c6e2546c0e6793c53739 Merge: 5ba1b34 2ae052b Author: Mike Perry <mikeperry-git(a)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(-)

1 0