May 2019 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1548634 - Update the default letterboxing behavior to use stepped ranges r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 166a752ab22ef1415c250eff37e1ada3f2f24915 Author: Tom Ritter <tom(a)mozilla.com> Date: Tue May 7 16:06:43 2019 +0000 Bug 1548634 - Update the default letterboxing behavior to use stepped ranges r=johannh Differential Revision: https://phabricator.services.mozilla.com/D29759 --- .../browser/browser_dynamical_window_rounding.js | 11 ++++------ .../components/resistfingerprinting/RFPHelper.jsm | 25 +++++++++++++++++----- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js index ae8055a49ce5..784fb42b8631 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js +++ b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js @@ -11,9 +11,7 @@ */ const TEST_PATH = "http://example.net/browser/browser/components/resistfingerprinting/test/bro…"; - -const DEFAULT_ROUNDED_WIDTH_STEP = 200; -const DEFAULT_ROUNDED_HEIGHT_STEP = 100; +const { RFPHelper } = ChromeUtils.import("resource://gre/modules/RFPHelper.jsm"); // A set of test cases which defines the width and the height of the outer window. const TEST_CASES = [ @@ -50,10 +48,9 @@ function handleOSFuzziness(aContent, aTarget) { function checkForDefaultSetting( aContentWidth, aContentHeight, aRealWidth, aRealHeight) { - // The default behavior for rounding is to round window with 200x100 stepping. - // So, we can get the rounded size by subtracting the remainder. - let targetWidth = aRealWidth - (aRealWidth % DEFAULT_ROUNDED_WIDTH_STEP); - let targetHeight = aRealHeight - (aRealHeight % DEFAULT_ROUNDED_HEIGHT_STEP); + // We can get the rounded size by subtracting twice the margin. + let targetWidth = aRealWidth - (2 * RFPHelper.steppedRange(aRealWidth)); + let targetHeight = aRealHeight - (2 * RFPHelper.steppedRange(aRealHeight)); // This platform-specific code is explained in the large comment below. if (getPlatform() != "linux") { diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 2f3a1dd0e659..5f23d0679b53 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -21,9 +21,6 @@ const kPrefLetterboxingTesting = const kTopicDOMWindowOpened = "domwindowopened"; const kEventLetterboxingSizeUpdate = "Letterboxing:ContentSizeUpdated"; -const kDefaultWidthStepping = 200; -const kDefaultHeightStepping = 100; - var logConsole; function log(msg) { if (!logConsole) { @@ -338,6 +335,24 @@ class _RFPHelper { } /** + * Given a width or height, returns the appropriate margin to apply. + */ + steppedRange(aDimension) { + let stepping; + if (aDimension <= 50) { + return 0; + } else if (aDimension <= 500) { + stepping = 50; + } else if (aDimension <= 1600) { + stepping = 100; + } else { + stepping = 200; + } + + return (aDimension % stepping) / 2; + } + + /** * The function will round the given browser by adding margins around the * content viewport. */ @@ -373,8 +388,8 @@ class _RFPHelper { // stepping size. if (!this._letterboxingDimensions.length) { result = { - width: (aWidth % kDefaultWidthStepping) / 2, - height: (aHeight % kDefaultHeightStepping) / 2, + width: this.steppedRange(aWidth), + height: this.steppedRange(aHeight), }; log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ") = " + result.width + " x " + result.height); return result;

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1447592 Do not reset the Spoof English pref after disabling Resist Fingerprinting r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 69e7b6d159f3d7ec4d8e0987afe1925ade94c0f6 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:22:04 2019 -0500 Bug 1447592 Do not reset the Spoof English pref after disabling Resist Fingerprinting r=johannh Backports this patch to esr60 just to keep RFPHelper in sync --- toolkit/components/resistfingerprinting/RFPHelper.jsm | 1 - 1 file changed, 1 deletion(-) diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 5aef203ad38b..91630d7c169e 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -99,7 +99,6 @@ class _RFPHelper { this._addRFPObservers(); } else { this._removeRFPObservers(); - Services.prefs.setIntPref(kPrefSpoofEnglish, 0); } }

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 3: Implementing the window letterboxing. r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 06bed4d6845f681755c1e51db9497aeeaa5cd259 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:35:23 2019 -0500 Bug 1407366 - Part 3: Implementing the window letterboxing. r=johannh This patch implements the window letterboxing. The implementation is based on adding margins around the browser element to round the content viewport size. Whenever the browser content is resized, the RFPHelper will adjust margins around it. But it won't add any margins for an empty browser or a browser loads a content with the system principal. The letterboxing is hidden behind a hidden pref "privacy.resistFingerprinting.letterboxing." By default, it will use stepping size 200x100 to round content window. And we can customize the set of dimensions used for deciding the size of the rounded content viewport by the pref "privacy.resistFingerprinting.letterboxing.dimensions". This pref should be formated as 'width1xheight1, width2xheight2, ...'. We will find the dimensions which can fit into the real content size and have the smallest margins to be the rounded content viewport size. For example , given the set "400x200, 500x300, 800x500" and the real content size "600x300", we would round the content size into 500x300. --- browser/base/content/content.js | 4 + .../components/resistfingerprinting/RFPHelper.jsm | 288 ++++++++++++++++++++- toolkit/components/resistfingerprinting/moz.build | 2 +- 3 files changed, 291 insertions(+), 3 deletions(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index d04adab3095a..9d5aa51dbfc9 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -40,6 +40,10 @@ var contextMenu = this.contextMenu = new ContextMenu(global); // Load the form validation popup handler var formSubmitObserver = new FormSubmitObserver(content, this); +addEventListener("resize", function() { + sendAsyncMessage("Letterboxing:ContentSizeUpdated"); +}); + addMessageListener("RemoteLogins:fillForm", function(message) { // intercept if ContextMenu.jsm had sent a plain object for remote targets message.objects.inputElement = contextMenu.getTarget(message, "inputElement"); diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 91630d7c169e..4fb889ab16fe 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -13,9 +13,18 @@ const kPrefResistFingerprinting = "privacy.resistFingerprinting"; const kPrefSpoofEnglish = "privacy.spoof_english"; const kTopicHttpOnModifyRequest = "http-on-modify-request"; +const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; +const kPrefLetterboxingDimensions = + "privacy.resistFingerprinting.letterboxing.dimensions"; +const kTopicDOMWindowOpened = "domwindowopened"; +const kEventLetterboxingSizeUpdate = "Letterboxing:ContentSizeUpdated"; + +const kDefaultWidthStepping = 200; +const kDefaultHeightStepping = 100; + class _RFPHelper { // ============================================================================ - // Setup + // Shared Setup // ============================================================================ constructor() { this._initialized = false; @@ -29,8 +38,13 @@ class _RFPHelper { // Add unconditional observers Services.prefs.addObserver(kPrefResistFingerprinting, this); - // Add RFP observers if the pref is enabled + Services.prefs.addObserver(kPrefLetterboxing, this); + XPCOMUtils.defineLazyPreferenceGetter(this, "_letterboxingDimensions", + kPrefLetterboxingDimensions, "", null, this._parseLetterboxingDimensions); + + // Add RFP and Letterboxing observers if prefs are enabled this._handleResistFingerprintingChanged(); + this._handleLetterboxingPrefChanged(); } uninit() { @@ -41,6 +55,7 @@ class _RFPHelper { // Remove unconditional observers Services.prefs.removeObserver(kPrefResistFingerprinting, this); + Services.prefs.removeObserver(kPrefLetterboxing, this); // Remove the RFP observers, swallowing exceptions if they weren't present this._removeRFPObservers(); } @@ -53,6 +68,36 @@ class _RFPHelper { case kTopicHttpOnModifyRequest: this._handleHttpOnModifyRequest(subject, data); break; + case kTopicDOMWindowOpened: + // We attach to the newly created window by adding tabsProgressListener + // and event listener on it. We listen for new tabs being added or + // the change of the content principal and apply margins accordingly. + this._handleDOMWindowOpened(subject); + break; + default: + break; + } + } + + handleEvent(aMessage) { + switch (aMessage.type) { + case "TabOpen": + { + let tab = aMessage.target; + this._addOrClearContentMargin(tab.linkedBrowser); + break; + } + default: + break; + } + } + + receiveMessage(aMessage) { + switch (aMessage.name) { + case kEventLetterboxingSizeUpdate: + let win = aMessage.target.ownerGlobal; + this._updateMarginsForTabsInWindow(win); + break; default: break; } @@ -66,6 +111,9 @@ class _RFPHelper { case kPrefSpoofEnglish: this._handleSpoofEnglishChanged(); break; + case kPrefLetterboxing: + this._handleLetterboxingPrefChanged(); + break; default: break; } @@ -211,6 +259,242 @@ class _RFPHelper { } return httpChannel.getRequestHeader("Accept-Language"); } + + // ============================================================================== + // Letterboxing + // ============================================================================ + /** + * We use the TabsProgressListener to catch the change of the content + * principal. We would clear the margins around the content viewport if + * it is the system principal. + */ + onLocationChange(aBrowser) { + this._addOrClearContentMargin(aBrowser); + } + + _handleLetterboxingPrefChanged() { + if (Services.prefs.getBoolPref(kPrefLetterboxing, false)) { + Services.ww.registerNotification(this); + this._attachAllWindows(); + } else { + this._detachAllWindows(); + Services.ww.unregisterNotification(this); + } + } + + // The function to parse the dimension set from the pref value. The pref value + // should be formated as 'width1xheight1, width2xheight2, ...'. For + // example, '100x100, 200x200, 400x200 ...'. + _parseLetterboxingDimensions(aPrefValue) { + if (!aPrefValue || !aPrefValue.match(/^(?:\d+x\d+,\s*)*(?:\d+x\d+)$/)) { + if (aPrefValue) { + Cu.reportError(`Invalid pref value for ${kPrefLetterboxingDimensions}: ${aPrefValue}`); + } + return []; + } + + return aPrefValue.split(",").map(item => { + let sizes = item.split("x").map(size => parseInt(size, 10)); + + return { + width: sizes[0], + height: sizes[1], + }; + }); + } + + _addOrClearContentMargin(aBrowser) { + let tab = aBrowser.getTabBrowser() + .getTabForBrowser(aBrowser); + + // We won't do anything for lazy browsers. + if (!aBrowser.isConnected) { + return; + } + + // We should apply no margin around an empty tab or a tab with system + // principal. + if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) { + this._clearContentViewMargin(aBrowser); + } else { + this._roundContentView(aBrowser); + } + } + + /** + * The function will round the given browser by adding margins around the + * content viewport. + */ + async _roundContentView(aBrowser) { + let win = aBrowser.ownerGlobal; + let browserContainer = aBrowser.getTabBrowser() + .getBrowserContainer(aBrowser); + + let {contentWidth, contentHeight, containerWidth, containerHeight} = + await win.promiseDocumentFlushed(() => { + let contentWidth = aBrowser.clientWidth; + let contentHeight = aBrowser.clientHeight; + let containerWidth = browserContainer.clientWidth; + let containerHeight = browserContainer.clientHeight; + + return { + contentWidth, + contentHeight, + containerWidth, + containerHeight, + }; + }); + + let calcMargins = (aWidth, aHeight) => { + // If the set is empty, we will round the content with the default + // stepping size. + if (!this._letterboxingDimensions.length) { + return { + width: (aWidth % kDefaultWidthStepping) / 2, + height: (aHeight % kDefaultHeightStepping) / 2, + }; + } + + let matchingArea = aWidth * aHeight; + let minWaste = Number.MAX_SAFE_INTEGER; + let targetDimensions = undefined; + + // Find the desired dimensions which waste the least content area. + for (let dim of this._letterboxingDimensions) { + // We don't need to consider the dimensions which cannot fit into the + // real content size. + if (dim.width > aWidth || dim.height > aHeight) { + continue; + } + + let waste = matchingArea - dim.width * dim.height; + + if (waste >= 0 && waste < minWaste) { + targetDimensions = dim; + minWaste = waste; + } + } + + let result; + // If we cannot find any dimensions match to the real content window, this + // means the content area is smaller the smallest size in the set. In this + // case, we won't apply any margins. + if (!targetDimensions) { + result = { + width: 0, + height: 0, + }; + } else { + result = { + width: (aWidth - targetDimensions.width) / 2, + height: (aHeight - targetDimensions.height) / 2, + }; + } + + return result; + }; + + // Calculating the margins around the browser element in order to round the + // content viewport. We will use a 200x100 stepping if the dimension set + // is not given. + let margins = calcMargins(containerWidth, containerHeight); + + // If the size of the content is already quantized, we do nothing. + if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + return; + } + + win.requestAnimationFrame(() => { + // One cannot (easily) control the color of a margin unfortunately. + // An initial attempt to use a border instead of a margin resulted + // in offset event dispatching; so for now we use a colorless margin. + aBrowser.style.margin = `${margins.height}px ${margins.width}px`; + }); + } + + _clearContentViewMargin(aBrowser) { + aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.style.margin = ""; + }); + } + + _updateMarginsForTabsInWindow(aWindow) { + let tabBrowser = aWindow.gBrowser; + + for (let tab of tabBrowser.tabs) { + let browser = tab.linkedBrowser; + this._addOrClearContentMargin(browser); + } + } + + _attachWindow(aWindow) { + aWindow.gBrowser + .addTabsProgressListener(this); + aWindow.addEventListener("TabOpen", this); + aWindow.messageManager + .addMessageListener(kEventLetterboxingSizeUpdate, this); + + // Rounding the content viewport. + this._updateMarginsForTabsInWindow(aWindow); + } + + _attachAllWindows() { + let windowList = Services.wm.getEnumerator("navigator:browser"); + + while (windowList.hasMoreElements()) { + let win = windowList.getNext(); + + if (win.closed || !win.gBrowser) { + continue; + } + + this._attachWindow(win); + } + } + + _detachWindow(aWindow) { + let tabBrowser = aWindow.gBrowser; + tabBrowser.removeTabsProgressListener(this); + aWindow.removeEventListener("TabOpen", this); + aWindow.messageManager + .removeMessageListener(kEventLetterboxingSizeUpdate, this); + + // Clear all margins and tooltip for all browsers. + for (let tab of tabBrowser.tabs) { + let browser = tab.linkedBrowser; + this._clearContentViewMargin(browser); + } + } + + _detachAllWindows() { + let windowList = Services.wm.getEnumerator("navigator:browser"); + + while (windowList.hasMoreElements()) { + let win = windowList.getNext(); + + if (win.closed || !win.gBrowser) { + continue; + } + + this._detachWindow(win); + } + } + + _handleDOMWindowOpened(aSubject) { + let win = aSubject.QueryInterface(Ci.nsIDOMWindow); + let self = this; + + win.addEventListener("load", () => { + // We attach to the new window when it has been loaded if the new loaded + // window is a browsing window. + if (win.document + .documentElement + .getAttribute("windowtype") !== "navigator:browser") { + return; + } + self._attachWindow(win); + }, {once: true}); + } } let RFPHelper = new _RFPHelper(); diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build index 021f2786f966..f0c904d9c944 100644 --- a/toolkit/components/resistfingerprinting/moz.build +++ b/toolkit/components/resistfingerprinting/moz.build @@ -21,5 +21,5 @@ EXPORTS.mozilla += [ ] EXTRA_JS_MODULES += [ - 'RFPHelper.jsm', + 'RFPHelper.jsm' ]

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 4: Adding a test case for testing letterboxing. r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 610ad333716499f5f9cf704a1dd97e07d276f572 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:36:29 2019 -0500 Bug 1407366 - Part 4: Adding a test case for testing letterboxing. r=johannh This patch adds a test for ensuring the letterboxing works as we expect. It will open a tab and resize its window into several different sizes and to see if the margins are correctly apply. And it will also check that no margin should apply to a tab with chrome privilege. --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../browser/browser_dynamical_window_rounding.js | 277 +++++++++++++++++++++ modules/libpref/init/all.js | 3 + .../components/resistfingerprinting/RFPHelper.jsm | 35 ++- 4 files changed, 314 insertions(+), 2 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 024ee29907b4..1aa918b4574b 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -11,6 +11,7 @@ support-files = head.js [browser_block_mozAddonManager.js] +[browser_dynamical_window_rounding.js] [browser_navigator.js] [browser_netInfo.js] [browser_performanceAPI.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js new file mode 100644 index 000000000000..ea261b7820d7 --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js @@ -0,0 +1,277 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Bug 1407366 - A test case for reassuring the size of the content viewport is + * rounded if the window is resized when letterboxing is enabled. + */ + +const TEST_PATH = "http://example.net/browser/browser/components/resistfingerprinting/test/bro…"; + +const DEFAULT_ROUNDED_WIDTH_STEP = 200; +const DEFAULT_ROUNDED_HEIGHT_STEP = 100; + +// A set of test cases which defines the width and the height of the outer window. +const TEST_CASES = [ + {width: 1250, height: 1000}, + {width: 1500, height: 1050}, + {width: 1120, height: 760}, + {width: 800, height: 600}, + {width: 640, height: 400}, + {width: 500, height: 350}, + {width: 300, height: 170}, +]; + +function getPlatform() { + const {OS} = Services.appinfo; + if (OS == "WINNT") { + return "win"; + } else if (OS == "Darwin") { + return "mac"; + } + return "linux"; +} + +function handleOSFuzziness(aContent, aTarget) { + /* + * On Windows, we observed off-by-one pixel differences that + * couldn't be expained. When manually setting the window size + * to try to reproduce it; it did not occur. + */ + if (getPlatform() == "win") { + return Math.abs(aContent - aTarget) <= 1; + } + return aContent == aTarget; +} + +function checkForDefaultSetting( + aContentWidth, aContentHeight, aRealWidth, aRealHeight) { + // The default behavior for rounding is to round window with 200x100 stepping. + // So, we can get the rounded size by subtracting the remainder. + let targetWidth = aRealWidth - (aRealWidth % DEFAULT_ROUNDED_WIDTH_STEP); + let targetHeight = aRealHeight - (aRealHeight % DEFAULT_ROUNDED_HEIGHT_STEP); + + // This platform-specific code is explained in the large comment below. + if (getPlatform() != "linux") { + ok(handleOSFuzziness(aContentWidth, targetWidth), + `Default Dimensions: The content window width is correctly rounded into. ${aRealWidth}px -> ${aContentWidth}px should equal ${targetWidth}px`); + + ok(handleOSFuzziness(aContentHeight, targetHeight), + `Default Dimensions: The content window height is correctly rounded into. ${aRealHeight}px -> ${aContentHeight}px should equal ${targetHeight}px`); + + // Using ok() above will cause Win/Mac to fail on even the first test, we don't need to repeat it, return true so waitForCondition ends + return true; + } + // Returning true or false depending on if the test succeeded will cause Linux to repeat until it succeeds. + return handleOSFuzziness(aContentWidth, targetWidth) && handleOSFuzziness(aContentHeight, targetHeight); +} + +async function test_dynamical_window_rounding(aWindow, aCheckFunc) { + // We need to wait for the updating the margins for the newly opened tab, or + // it will affect the following tests. + let promiseForTheFirstRounding = + TestUtils.topicObserved("test:letterboxing:update-margin-finish"); + + info("Open a content tab for testing."); + let tab = await BrowserTestUtils.openNewForegroundTab( + aWindow.gBrowser, TEST_PATH + "file_dummy.html"); + + info("Wait until the margins are applied for the opened tab."); + await promiseForTheFirstRounding; + + let getContainerSize = (aTab) => { + let browserContainer = aWindow.gBrowser + .getBrowserContainer(aTab.linkedBrowser); + return { + containerWidth: browserContainer.clientWidth, + containerHeight: browserContainer.clientHeight, + }; + }; + + for (let {width, height} of TEST_CASES) { + let caseString = "Case " + width + "x" + height + ": "; + // Create a promise for waiting for the margin update. + let promiseRounding = + TestUtils.topicObserved("test:letterboxing:update-margin-finish"); + + let {containerWidth, containerHeight} = getContainerSize(tab); + + info(caseString + "Resize the window and wait until resize event happened (currently " + + containerWidth + "x" + containerHeight + ")"); + await new Promise(resolve => { + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Resizing (currently " + containerWidth + "x" + containerHeight + ")"); + + aWindow.onresize = () => { + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Resized (currently " + containerWidth + "x" + containerHeight + ")"); + if (getPlatform() == "linux" && containerWidth != width) { + /* + * We observed frequent test failures that resulted from receiving an onresize + * event where the browser was resized to an earlier requested dimension. This + * resize event happens on Linux only, and is an artifact of the asynchronous + * resizing. (See more discussion on 1407366#53) + * + * We cope with this problem in two ways. + * + * 1: If we detect that the browser was resized to the wrong value; we + * redo the resize. (This is the lines of code immediately following this + * comment) + * 2: We repeat the test until it works using waitForCondition(). But we still + * test Win/Mac more thoroughly: they do not loop in waitForCondition more + * than once, and can fail the test on the first attempt (because their + * check() functions use ok() while on Linux, we do not all ok() and instead + * rely on waitForCondition to fail). + * + * The logging statements in this test, and RFPHelper.jsm, help narrow down and + * illustrate the issue. + */ + info(caseString + "We hit the weird resize bug. Resize it again."); + aWindow.resizeTo(width, height); + } else { + resolve(); + } + }; + aWindow.resizeTo(width, height); + }); + + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Waiting until margin has been updated on browser element. (currently " + + containerWidth + "x" + containerHeight + ")"); + await promiseRounding; + + info(caseString + "Get innerWidth/Height from the content."); + await BrowserTestUtils.waitForCondition(async () => { + let {contentWidth, contentHeight} = await ContentTask.spawn( + tab.linkedBrowser, null, () => { + return { + contentWidth: content.innerWidth, + contentHeight: content.innerHeight, + }; + }); + + info(caseString + "Check the result."); + return aCheckFunc(contentWidth, contentHeight, containerWidth, containerHeight); + }, "Default Dimensions: The content window width is correctly rounded into."); + } + + BrowserTestUtils.removeTab(tab); +} + +async function test_customize_width_and_height(aWindow) { + const test_dimensions = `120x80, 200x143, 335x255, 600x312, 742x447, 813x558, + 990x672, 1200x733, 1470x858`; + + await SpecialPowers.pushPrefEnv({"set": + [ + ["privacy.resistFingerprinting.letterboxing.dimensions", test_dimensions], + ], + }); + + let dimensions_set = test_dimensions.split(",").map(item => { + let sizes = item.split("x").map(size => parseInt(size, 10)); + + return { + width: sizes[0], + height: sizes[1], + }; + }); + + let checkDimension = + (aContentWidth, aContentHeight, aRealWidth, aRealHeight) => { + let matchingArea = aRealWidth * aRealHeight; + let minWaste = Number.MAX_SAFE_INTEGER; + let targetDimensions = undefined; + + // Find the dimensions which waste the least content area. + for (let dim of dimensions_set) { + if (dim.width > aRealWidth || dim.height > aRealHeight) { + continue; + } + + let waste = matchingArea - dim.width * dim.height; + + if (waste >= 0 && waste < minWaste) { + targetDimensions = dim; + minWaste = waste; + } + } + + // This platform-specific code is explained in the large comment above. + if (getPlatform() != "linux") { + ok(handleOSFuzziness(aContentWidth, targetDimensions.width), + `Custom Dimension: The content window width is correctly rounded into. ${aRealWidth}px -> ${aContentWidth}px should equal ${targetDimensions.width}`); + + ok(handleOSFuzziness(aContentHeight, targetDimensions.height), + `Custom Dimension: The content window height is correctly rounded into. ${aRealHeight}px -> ${aContentHeight}px should equal ${targetDimensions.height}`); + + // Using ok() above will cause Win/Mac to fail on even the first test, we don't need to repeat it, return true so waitForCondition ends + return true; + } + // Returning true or false depending on if the test succeeded will cause Linux to repeat until it succeeds. + return handleOSFuzziness(aContentWidth, targetDimensions.width) && handleOSFuzziness(aContentHeight, targetDimensions.height); + }; + + await test_dynamical_window_rounding(aWindow, checkDimension); + + await SpecialPowers.popPrefEnv(); +} + +async function test_no_rounding_for_chrome(aWindow) { + // First, resize the window to a size with is not rounded. + await new Promise(resolve => { + aWindow.onresize = () => resolve(); + aWindow.resizeTo(700, 450); + }); + + // open a chrome privilege tab, like about:config. + let tab = await BrowserTestUtils.openNewForegroundTab( + aWindow.gBrowser, "about:config"); + + // Check that the browser element should not have a margin. + is(tab.linkedBrowser.style.margin, "", "There is no margin around chrome tab."); + + BrowserTestUtils.removeTab(tab); +} + +add_task(async function setup() { + await SpecialPowers.pushPrefEnv({"set": + [ + ["privacy.resistFingerprinting.letterboxing", true], + ["privacy.resistFingerprinting.letterboxing.testing", true], + ], + }); +}); + +add_task(async function do_tests() { + // Store the original window size before testing. + let originalOuterWidth = window.outerWidth; + let originalOuterHeight = window.outerHeight; + + info("Run test for the default window rounding."); + await test_dynamical_window_rounding(window, checkForDefaultSetting); + + info("Run test for the window rounding with customized dimensions."); + await test_customize_width_and_height(window); + + info("Run test for no margin around tab with the chrome privilege."); + await test_no_rounding_for_chrome(window); + + // Restore the original window size. + window.outerWidth = originalOuterWidth; + window.outerHeight = originalOuterHeight; + + // Testing that whether the dynamical rounding works for new windows. + let win = await BrowserTestUtils.openNewBrowserWindow(); + + info("Run test for the default window rounding in new window."); + await test_dynamical_window_rounding(win, checkForDefaultSetting); + + info("Run test for the window rounding with customized dimensions in new window."); + await test_customize_width_and_height(win); + + info("Run test for no margin around tab with the chrome privilege in new window."); + await test_no_rounding_for_chrome(win); + + await BrowserTestUtils.closeWindow(win); +}); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 9dc30b8efe44..5b1d0a1c8972 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1414,6 +1414,9 @@ pref("privacy.resistFingerprinting", false); // If you do set it, to work around some broken website, please file a bug with // information so we can understand why it is needed. pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", true); +// The log level for browser console messages logged in RFPHelper.jsm +// Change to 'All' and restart to see the messages +pref("privacy.resistFingerprinting.jsmloglevel", "Warn"); // A subset of Resist Fingerprinting protections focused specifically on timers for testing // This affects the Animation API, the performance APIs, Date.getTime, Event.timestamp, // File.lastModified, audioContext.currentTime, canvas.captureStream.currentTime diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 4fb889ab16fe..2f3a1dd0e659 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -16,12 +16,26 @@ const kTopicHttpOnModifyRequest = "http-on-modify-request"; const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; const kPrefLetterboxingDimensions = "privacy.resistFingerprinting.letterboxing.dimensions"; +const kPrefLetterboxingTesting = + "privacy.resistFingerprinting.letterboxing.testing"; const kTopicDOMWindowOpened = "domwindowopened"; const kEventLetterboxingSizeUpdate = "Letterboxing:ContentSizeUpdated"; const kDefaultWidthStepping = 200; const kDefaultHeightStepping = 100; +var logConsole; +function log(msg) { + if (!logConsole) { + logConsole = console.createInstance({ + prefix: "RFPHelper.jsm", + maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", + }); + } + + logConsole.log(msg); +} + class _RFPHelper { // ============================================================================ // Shared Setup @@ -41,6 +55,8 @@ class _RFPHelper { Services.prefs.addObserver(kPrefLetterboxing, this); XPCOMUtils.defineLazyPreferenceGetter(this, "_letterboxingDimensions", kPrefLetterboxingDimensions, "", null, this._parseLetterboxingDimensions); + XPCOMUtils.defineLazyPreferenceGetter(this, "_isLetterboxingTesting", + kPrefLetterboxingTesting, false); // Add RFP and Letterboxing observers if prefs are enabled this._handleResistFingerprintingChanged(); @@ -326,6 +342,8 @@ class _RFPHelper { * content viewport. */ async _roundContentView(aBrowser) { + let logId = Math.random(); + log("_roundContentView[" + logId + "]"); let win = aBrowser.ownerGlobal; let browserContainer = aBrowser.getTabBrowser() .getBrowserContainer(aBrowser); @@ -345,14 +363,21 @@ class _RFPHelper { }; }); + log("_roundContentView[" + logId + "] contentWidth=" + contentWidth + " contentHeight=" + contentHeight + + " containerWidth=" + containerWidth + " containerHeight=" + containerHeight + " "); + let calcMargins = (aWidth, aHeight) => { + let result; + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ")"); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - return { + result = { width: (aWidth % kDefaultWidthStepping) / 2, height: (aHeight % kDefaultHeightStepping) / 2, }; + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ") = " + result.width + " x " + result.height); + return result; } let matchingArea = aWidth * aHeight; @@ -375,7 +400,6 @@ class _RFPHelper { } } - let result; // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't apply any margins. @@ -391,6 +415,7 @@ class _RFPHelper { }; } + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ") = " + result.width + " x " + result.height); return result; }; @@ -401,10 +426,16 @@ class _RFPHelper { // If the size of the content is already quantized, we do nothing. if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + log("_roundContentView[" + logId + "] is_rounded == true"); + if (this._isLetterboxingTesting) { + log("_roundContentView[" + logId + "] is_rounded == true test:letterboxing:update-margin-finish"); + Services.obs.notifyObservers(null, "test:letterboxing:update-margin-finish"); + } return; } win.requestAnimationFrame(() => { + log("_roundContentView[" + logId + "] setting margins to " + margins.width + " x " + margins.height); // One cannot (easily) control the color of a margin unfortunately. // An initial attempt to use a border instead of a margin resulted // in offset event dispatching; so for now we use a colorless margin.

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 2: Rearrange RFPHelper for expansion r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 7f3ce3ef4cf86690864a4abd7ca58a9e5dbb087f Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:17:53 2019 -0500 Bug 1407366 - Part 2: Rearrange RFPHelper for expansion r=johannh This patch rearranges RFPHelper.jsm to make it more clear what parts of the file are responsible for what feature. --- .../components/resistfingerprinting/RFPHelper.jsm | 62 +++++++++++++--------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 2e8e85072364..5aef203ad38b 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -14,6 +14,9 @@ const kPrefSpoofEnglish = "privacy.spoof_english"; const kTopicHttpOnModifyRequest = "http-on-modify-request"; class _RFPHelper { + // ============================================================================ + // Setup + // ============================================================================ constructor() { this._initialized = false; } @@ -24,7 +27,9 @@ class _RFPHelper { } this._initialized = true; + // Add unconditional observers Services.prefs.addObserver(kPrefResistFingerprinting, this); + // Add RFP observers if the pref is enabled this._handleResistFingerprintingChanged(); } @@ -34,8 +39,10 @@ class _RFPHelper { } this._initialized = false; + // Remove unconditional observers Services.prefs.removeObserver(kPrefResistFingerprinting, this); - this._removeObservers(); + // Remove the RFP observers, swallowing exceptions if they weren't present + this._removeRFPObservers(); } observe(subject, topic, data) { @@ -51,24 +58,6 @@ class _RFPHelper { } } - _removeObservers() { - try { - Services.pref.removeObserver(kPrefSpoofEnglish, this); - } catch (e) { - // do nothing - } - try { - Services.obs.removeObserver(this, kTopicHttpOnModifyRequest); - } catch (e) { - // do nothing - } - } - - _shouldPromptForLanguagePref() { - return (Services.locale.getAppLocaleAsLangTag().substr(0, 2) !== "en") - && (Services.prefs.getIntPref(kPrefSpoofEnglish) === 0); - } - _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: @@ -82,14 +71,34 @@ class _RFPHelper { } } + // ============================================================================ + // Language Prompt + // ============================================================================ + _addRFPObservers() { + Services.prefs.addObserver(kPrefSpoofEnglish, this); + if (this._shouldPromptForLanguagePref()) { + Services.obs.addObserver(this, kTopicHttpOnModifyRequest); + } + } + + _removeRFPObservers() { + try { + Services.pref.removeObserver(kPrefSpoofEnglish, this); + } catch (e) { + // do nothing + } + try { + Services.obs.removeObserver(this, kTopicHttpOnModifyRequest); + } catch (e) { + // do nothing + } + } + _handleResistFingerprintingChanged() { if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { - Services.prefs.addObserver(kPrefSpoofEnglish, this); - if (this._shouldPromptForLanguagePref()) { - Services.obs.addObserver(this, kTopicHttpOnModifyRequest); - } + this._addRFPObservers(); } else { - this._removeObservers(); + this._removeRFPObservers(); Services.prefs.setIntPref(kPrefSpoofEnglish, 0); } } @@ -116,6 +125,11 @@ class _RFPHelper { } } + _shouldPromptForLanguagePref() { + return (Services.locale.getAppLocaleAsLangTag().substr(0, 2) !== "en") + && (Services.prefs.getIntPref(kPrefSpoofEnglish) === 0); + } + _handleHttpOnModifyRequest(subject, data) { // If we are loading an HTTP page from content, show the // "request English language web pages?" prompt.

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 1: Rename the LanguagePrompt.jsm to RFPHelper.jsm and changing the place of doing uninitialization. r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 0958b375400c51ddd1c61cda14acae686697729b Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:13:27 2019 -0500 Bug 1407366 - Part 1: Rename the LanguagePrompt.jsm to RFPHelper.jsm and changing the place of doing uninitialization. r=johannh This patch changes the name of LanguagePrompt.jsm to RFPHelper.jsm. The RFPHelper is going to not only be responsible for the language --- browser/base/content/browser.js | 4 +--- browser/components/nsBrowserGlue.js | 5 +++-- .../resistfingerprinting/{LanguagePrompt.jsm => RFPHelper.jsm} | 6 +++--- toolkit/components/resistfingerprinting/moz.build | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 16e712be0ba3..3e3b1b203219 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -29,7 +29,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", FormValidationHandler: "resource:///modules/FormValidationHandler.jsm", - LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm", LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.jsm", LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm", Log: "resource://gre/modules/Log.jsm", @@ -47,6 +46,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", ReaderMode: "resource://gre/modules/ReaderMode.jsm", ReaderParent: "resource:///modules/ReaderParent.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", RecentWindow: "resource:///modules/RecentWindow.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", @@ -1908,8 +1908,6 @@ var gBrowserInit = { gAccessibilityServiceIndicator.uninit(); - LanguagePrompt.uninit(); - BrowserSearch.uninit(); // Now either cancel delayedStartup, or clean up the services initialized from diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 861a62e442df..564035bfd3a2 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -104,7 +104,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { HybridContentTelemetry: "resource://gre/modules/HybridContentTelemetry.jsm", Integration: "resource://gre/modules/Integration.jsm", L10nRegistry: "resource://gre/modules/L10nRegistry.jsm", - LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm", LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm", LoginHelper: "resource://gre/modules/LoginHelper.jsm", LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm", @@ -126,6 +125,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { ReaderParent: "resource:///modules/ReaderParent.jsm", RecentWindow: "resource:///modules/RecentWindow.jsm", RemotePrompt: "resource:///modules/RemotePrompt.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", @@ -1058,6 +1058,7 @@ BrowserGlue.prototype = { } Normandy.uninit(); + RFPHelper.uninit(); }, // All initial windows have opened. @@ -1220,7 +1221,7 @@ BrowserGlue.prototype = { } Services.tm.idleDispatchToMainThread(() => { - LanguagePrompt.init(); + RFPHelper.init(); }); Services.tm.idleDispatchToMainThread(() => { diff --git a/toolkit/components/resistfingerprinting/LanguagePrompt.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm old mode 100644 new mode 100755 similarity index 98% rename from toolkit/components/resistfingerprinting/LanguagePrompt.jsm rename to toolkit/components/resistfingerprinting/RFPHelper.jsm index d27402ccacf1..2e8e85072364 --- a/toolkit/components/resistfingerprinting/LanguagePrompt.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -var EXPORTED_SYMBOLS = ["LanguagePrompt"]; +var EXPORTED_SYMBOLS = ["RFPHelper"]; ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -13,7 +13,7 @@ const kPrefResistFingerprinting = "privacy.resistFingerprinting"; const kPrefSpoofEnglish = "privacy.spoof_english"; const kTopicHttpOnModifyRequest = "http-on-modify-request"; -class _LanguagePrompt { +class _RFPHelper { constructor() { this._initialized = false; } @@ -200,4 +200,4 @@ class _LanguagePrompt { } } -let LanguagePrompt = new _LanguagePrompt(); +let RFPHelper = new _RFPHelper(); diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build index 88525f6189eb..021f2786f966 100644 --- a/toolkit/components/resistfingerprinting/moz.build +++ b/toolkit/components/resistfingerprinting/moz.build @@ -21,5 +21,5 @@ EXPORTS.mozilla += [ ] EXTRA_JS_MODULES += [ - 'LanguagePrompt.jsm', + 'RFPHelper.jsm', ]

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 5: Reset the Zoom in browser_bug1369357_site_specific_zoom_level.js r=johann
by gk＠torproject.org 17 May '19

17 May '19

commit 003019c16626dc515d5fe9defb999be1ab8ad397 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:37:12 2019 -0500 Bug 1407366 - Part 5: Reset the Zoom in browser_bug1369357_site_specific_zoom_level.js r=johann This test changes the browser zoom level; but does not reset it; causing subsequant tests to be run with a zoom. This may cause them to fail. --- .../test/browser/browser_bug1369357_site_specific_zoom_level.js | 2 ++ .../test/browser/browser_dynamical_window_rounding.js | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js index b4af91ebf980..4a4c36015b5c 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js +++ b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js @@ -25,6 +25,8 @@ add_task(async function() { isnot(tab3Zoom, tab1Zoom, "privacy.resistFingerprinting is true, site-specific zoom level should be disabled"); + await FullZoom.reset(); + await BrowserTestUtils.removeTab(tab1); await BrowserTestUtils.removeTab(tab2); await BrowserTestUtils.removeTab(tab3); diff --git a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js index ea261b7820d7..ae8055a49ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js +++ b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js @@ -4,6 +4,10 @@ * * Bug 1407366 - A test case for reassuring the size of the content viewport is * rounded if the window is resized when letterboxing is enabled. + * + * A helpful note: if this test starts randomly failing; it may be because the + * zoom level was not reset by an earlier-run test. See Bug 1407366 for an + * example. */ const TEST_PATH = "http://example.net/browser/browser/components/resistfingerprinting/test/bro…";

1 0

[torbutton/master] Bug 30464: Add WebGL to safer descriptions
by gk＠torproject.org 17 May '19

17 May '19

commit f4836d963fb71af377d6834a6a2bd58663afbac8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 10 09:31:47 2019 +0000 Bug 30464: Add WebGL to safer descriptions --- src/chrome/locale/en-US/securityLevel.properties | 4 ++-- src/chrome/locale/en-US/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en-US/securityLevel.properties b/src/chrome/locale/en-US/securityLevel.properties index 6ccbb033..1b941b5c 100644 --- a/src/chrome/locale/en-US/securityLevel.properties +++ b/src/chrome/locale/en-US/securityLevel.properties @@ -9,7 +9,7 @@ securityLevel.safer.tooltip = Security Level : Safer securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. securityLevel.safer.description2 = Some fonts and math symbols are disabled. -securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. securityLevel.safest.level = Safest securityLevel.safest.tooltip = Security Level : Safest securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. @@ -19,4 +19,4 @@ securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-p securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. securityLevel.learnMore = Learn more securityLevel.restoreDefaults = Restore Defaults -securityLevel.advancedSecuritySettings = Advanced Security Settings… \ No newline at end of file +securityLevel.advancedSecuritySettings = Advanced Security Settings… diff --git a/src/chrome/locale/en-US/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd index 83b1ffb5..2e106f60 100644 --- a/src/chrome/locale/en-US/torbutton.dtd +++ b/src/chrome/locale/en-US/torbutton.dtd @@ -36,6 +36,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> <!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">

1 0

[torbutton/master] Merge branch 'bug_30464'
by gk＠torproject.org 17 May '19

17 May '19

commit 24ff29e3a854ee6c4f5ad5b1004ce212cddeb2e4 Merge: 0e3106d2 f4836d96 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 17 05:59:23 2019 +0000 Merge branch 'bug_30464' src/chrome/locale/en-US/securityLevel.properties | 4 ++-- src/chrome/locale/en-US/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/maint-8.5] Picking up last minute mobile fixes for build3
by gk＠torproject.org 16 May '19

16 May '19

commit 309770d10424a275be08d715edbbb9089a5c15bc Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 16 21:54:08 2019 +0000 Picking up last minute mobile fixes for build3 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 717cc6a..54f6c65 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0.9 project_name: tor-browser

1 0