August 2020 - tor-commits - lists.torproject.org

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 07 Aug '20

07 Aug '20

commit 262288b36e6484e9ef2fe2231e92c1040c700eb0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 7 15:48:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/contents+es.po b/contents+es.po index b5e060b7d3..9adfc7721a 100644 --- a/contents+es.po +++ b/contents+es.po @@ -11960,6 +11960,9 @@ msgid "" "you may want to consider moving to a network that is more open to free " "speech." msgstr "" +"Si explicas el problema, y concluyen que Tor debe ser bloqueado, puede que " +"quieras considerar moverte a una red que es más abierta a la libertad de " +"palabra." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11967,6 +11970,8 @@ msgid "" "Maybe inviting them to #tor on irc.oftc.net will help show them that we are " "not all evil people." msgstr "" +"Tal vez invitándolos a #tor en irc.oftc.net ayudará a mostrarles que no " +"todos somos personas malvadas." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11977,6 +11982,11 @@ msgid "" "tracker](https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) so " "that others can share." msgstr "" +"Finalmente, si llega a tu atención una red IRC que parece estar bloqueando a" +" Tor, o a un único nodo Tor de salida, por favor pon esa información en [El " +"Rastreador de bloqueos IRC de " +"Tor](https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) de modo " +"que otros puedan compartirla." #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) @@ -11984,16 +11994,18 @@ msgid "" "At least one IRC network consults that page to unblock exit nodes that have " "been blocked inadvertently." msgstr "" +"Al menos una red IRC consulta esa página para desbloquear nodos de salida " +"que han sido inadvertidamente bloqueados." #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.title) msgid "I have legal questions about Tor abuse." -msgstr "" +msgstr "Tengo preguntas legales acerca del abuso de Tor." #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.description) msgid "We're only the developers." -msgstr "" +msgstr "Solamente somos los desarrolladores." #: https//support.torproject.org/abuse/legal-questions-about-tor-abuse/ #: (content/abuse/legal-questions/contents+en.lrquestion.description)

1 0

[torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/3' into master
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004 Merge: c36ccb58 0b80394c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 14:31:41 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/3' into master components/domain-isolator.js | 8 +++++++- components/dragDropFilter.js | 9 ++++++++- components/external-app-blocker.js | 9 ++++++++- components/startup-observer.js | 9 ++++++++- components/torCheckService.js | 9 ++++++++- components/torbutton-logger.js | 16 ++++++++-------- 6 files changed, 47 insertions(+), 13 deletions(-)

1 0

[torbutton/master] Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 0b80394c77f8d3c4f9df7594e692da857300b60f Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 30 20:53:07 2020 +0200 Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils This was changed in https://bugzilla.mozilla.org/show_bug.cgi?id=1649554. --- components/domain-isolator.js | 8 +++++++- components/dragDropFilter.js | 9 ++++++++- components/external-app-blocker.js | 9 ++++++++- components/startup-observer.js | 9 ++++++++- components/torCheckService.js | 9 ++++++++- components/torbutton-logger.js | 16 ++++++++-------- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/components/domain-isolator.js b/components/domain-isolator.js index 38d0abe8..06fe1e2e 100644 --- a/components/domain-isolator.js +++ b/components/domain-isolator.js @@ -11,6 +11,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Make the logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; @@ -199,4 +203,6 @@ DomainIsolator.prototype = { }; // Assign factory to global object. -const NSGetFactory = XPCOMUtils.generateNSGetFactory([DomainIsolator]); +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([DomainIsolator]) + : ComponentUtils.generateNSGetFactory([DomainIsolator]); diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js index f48d1b38..361424d1 100644 --- a/components/dragDropFilter.js +++ b/components/dragDropFilter.js @@ -9,6 +9,10 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; const kCONTRACT_ID = "@torproject.org/torbutton-dragDropFilter;1"; @@ -79,4 +83,7 @@ DragDropFilter.prototype = } }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([DragDropFilter]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([DragDropFilter]) + : ComponentUtils.generateNSGetFactory([DragDropFilter]); diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index 89d6d252..2fa80d9d 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -16,6 +16,10 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + let { torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); // Module specific constants @@ -131,4 +135,7 @@ ExternalAppBlocker.prototype = }, }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]) + : ComponentUtils.generateNSGetFactory([ExternalAppBlocker]); diff --git a/components/startup-observer.js b/components/startup-observer.js index d2d1d610..c81eebab 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -15,6 +15,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + XPCOMUtils.defineLazyModuleGetters(this, { FileUtils: "resource://gre/modules/FileUtils.jsm", FileSource: "resource://gre/modules/L10nRegistry.jsm", @@ -205,4 +209,7 @@ StartupObserver.prototype = { _xpcom_categories: [{category:"profile-after-change"}], }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([StartupObserver]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([StartupObserver]) + : ComponentUtils.generateNSGetFactory([StartupObserver]); diff --git a/components/torCheckService.js b/components/torCheckService.js index 409cc2c5..07b1aa99 100644 --- a/components/torCheckService.js +++ b/components/torCheckService.js @@ -10,6 +10,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Module specific constants const kMODULE_NAME = "Torbutton Tor Check Service"; const kMODULE_CONTRACTID = "@torproject.org/torbutton-torCheckService;1"; @@ -131,4 +135,7 @@ TBTorCheckService.prototype = }, }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([TBTorCheckService]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([TBTorCheckService]) + : ComponentUtils.generateNSGetFactory([TBTorCheckService]); diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js index 1c946fa7..d80d13c4 100644 --- a/components/torbutton-logger.js +++ b/components/torbutton-logger.js @@ -16,6 +16,10 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + function TorbuttonLogger() { // Register observer Services.prefs.addObserver("extensions.torbutton", this); @@ -154,11 +158,7 @@ TorbuttonLogger.prototype = } } -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorbuttonLogger]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([TorbuttonLogger]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([TorbuttonLogger]) + : ComponentUtils.generateNSGetFactory([TorbuttonLogger]);

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 40025: Remove Mozilla add-on install permissions
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 988c57a8c8b2f0a2576920ade8468ef80b6fa32b Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 27 18:12:55 2020 +0200 Bug 40025: Remove Mozilla add-on install permissions --- browser/app/permissions | 6 ------ 1 file changed, 6 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index da6b6728043d..5c4c302f5ba5 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -11,12 +11,6 @@ origin uitour 1 https://3g2upl4pq6kufc4m.onion origin uitour 1 about:tor -# XPInstall -origin install 1 https://addons.mozilla.org - # Remote troubleshooting origin remote-troubleshooting 1 https://support.mozilla.org -# addon install -origin install 1 https://private-network.firefox.com -origin install 1 https://fpn.firefox.com

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit e0874b092e93e58c9abd70bdcdd87610cc7efc1e Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 27 18:11:27 2020 +0200 fixup! Bug 26961: New user onboarding. --- browser/app/permissions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/permissions b/browser/app/permissions index 06d71cd6e88c..da6b6728043d 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -17,3 +17,6 @@ origin install 1 https://addons.mozilla.org # Remote troubleshooting origin remote-troubleshooting 1 https://support.mozilla.org +# addon install +origin install 1 https://private-network.firefox.com +origin install 1 https://fpn.firefox.com

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 2176: Rebrand Firefox to TorBrowser
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit ec56b5afac8b53d295edf75c8b772098310c614c Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 4 19:05:22 2020 +0200 fixup! Bug 2176: Rebrand Firefox to TorBrowser Fixes #40022. --- browser/branding/alpha/default22.png | Bin 0 -> 1240 bytes browser/branding/alpha/default24.png | Bin 0 -> 1368 bytes browser/branding/nightly/default22.png | Bin 0 -> 1377 bytes browser/branding/nightly/default24.png | Bin 0 -> 1509 bytes browser/branding/official/default22.png | Bin 0 -> 1250 bytes browser/branding/official/default24.png | Bin 0 -> 1405 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/browser/branding/alpha/default22.png b/browser/branding/alpha/default22.png new file mode 100644 index 000000000000..4feb2dbd400c Binary files /dev/null and b/browser/branding/alpha/default22.png differ diff --git a/browser/branding/alpha/default24.png b/browser/branding/alpha/default24.png new file mode 100644 index 000000000000..4387f97e3d62 Binary files /dev/null and b/browser/branding/alpha/default24.png differ diff --git a/browser/branding/nightly/default22.png b/browser/branding/nightly/default22.png new file mode 100644 index 000000000000..02c87a9e2db6 Binary files /dev/null and b/browser/branding/nightly/default22.png differ diff --git a/browser/branding/nightly/default24.png b/browser/branding/nightly/default24.png new file mode 100644 index 000000000000..34cfedb2d908 Binary files /dev/null and b/browser/branding/nightly/default24.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png new file mode 100644 index 000000000000..41cc3543d39f Binary files /dev/null and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png new file mode 100644 index 000000000000..195cae90d3ed Binary files /dev/null and b/browser/branding/official/default24.png differ

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit fad325072ede8c2ced828385006cef7b6ebaa161 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 24 11:03:28 2020 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core Fixes #33737 --- browser/base/content/aboutDialog.xhtml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 1ee820326dc6..02096fbfa3c0 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -28,7 +28,7 @@ data-l10n-id="aboutDialog-title" #endif role="dialog" - aria-describedby="version distribution distributionId communityDesc contributeDesc trademark" + aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor" > #ifdef XP_MACOSX #include macWindow.inc.xhtml @@ -132,6 +132,9 @@ <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label> </description> </vbox> +  + <description class="text-blurb" id="communityDesc" data-l10n-id="community-2" hidden="true"></description> + <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus" hidden="true"></description> <description class="text-blurb" id="projectDesc"> &project.start; <label is="text-link" href="https://www.torproject.org/">

1 0

[tor-browser-build/master] Move our nightly over to 78.1.0esr
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit eeb2153d798e2efb90e979a190d2bf63623f35c2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 13:50:04 2020 +0000 Move our nightly over to 78.1.0esr --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9876240..d42474b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.0.1 + firefox_platform_version: 78.1.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 32658: Create a new MAR signing key
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit ac66a7e4855af29ea929bf4089ad151688100f80 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 17 12:54:31 2020 +0000 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1225 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1225 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 1d94f88ad73b..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 474706c4b73c..fcee3944e9b7 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 32220: Improve the letterboxing experience
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit acaa1dcec496cf3b69f3cc47af9909bdf4f20851 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 28 17:42:17 2019 -0700 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and border are tied to the currently selected theme. Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race condition present when using the 'isEmpty' property. Using 'isEmpty' as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary letterboxing of about:blank tabs. --- browser/base/content/browser.css | 8 ++ browser/base/content/tabbrowser-tab.js | 9 +++ browser/themes/shared/tabs.inc.css | 6 ++ .../components/resistfingerprinting/RFPHelper.jsm | 94 +++++++++++++++++++--- 4 files changed, 105 insertions(+), 12 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 808c03e88223..a0b1bf4a8951 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -85,6 +85,14 @@ body { display: none; } + +.browserStack > browser.letterboxing { + border-color: var(--chrome-content-separator-color); + border-style: solid; + border-width : 1px; + border-top: none; +} + %ifdef MENUBAR_CAN_AUTOHIDE #toolbar-menubar[autohide="true"] { overflow: hidden; diff --git a/browser/base/content/tabbrowser-tab.js b/browser/base/content/tabbrowser-tab.js index 183eff1bab86..7f376ab1d122 100644 --- a/browser/base/content/tabbrowser-tab.js +++ b/browser/base/content/tabbrowser-tab.js @@ -225,6 +225,15 @@ return true; } + get needsLetterbox() { + let browser = this.linkedBrowser; + if (isBlankPageURL(browser.currentURI.spec)) { + return false; + } + + return true; + } + get lastAccessed() { return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed; } diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index b47842af766c..019da6ecf76f 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -33,6 +33,12 @@ background-color: #f9f9fa; } +/* extend down the toolbar's colors when letterboxing is enabled*/ +#tabbrowser-tabpanels.letterboxing { + background-color: var(--toolbar-bgcolor); + background-image: var(--toolbar-bgimage); +} + :root[privatebrowsingmode=temporary] #tabbrowser-tabpanels { /* Value for --in-content-page-background in aboutPrivateBrowsing.css */ background-color: #25003e; diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 49010d1c8cb1..b906a067fd63 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -40,6 +40,7 @@ class _RFPHelper { // ============================================================================ constructor() { this._initialized = false; + this._borderDimensions = null; } init() { @@ -361,6 +362,24 @@ class _RFPHelper { }); } + getBorderDimensions(aBrowser) { + if (this._borderDimensions) { + return this._borderDimensions; + } + + const win = aBrowser.ownerGlobal; + const browserStyle = win.getComputedStyle(aBrowser); + + this._borderDimensions = { + top : parseInt(browserStyle.borderTopWidth), + right: parseInt(browserStyle.borderRightWidth), + bottom : parseInt(browserStyle.borderBottomWidth), + left : parseInt(browserStyle.borderLeftWidth), + }; + + return this._borderDimensions; + } + _addOrClearContentMargin(aBrowser) { let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser); @@ -369,9 +388,13 @@ class _RFPHelper { return; } + // we add the letterboxing class even if the content does not need letterboxing + // in which case margins are set such that the borders are hidden + aBrowser.classList.add("letterboxing"); + // We should apply no margin around an empty tab or a tab with system // principal. - if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) { + if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) { this._clearContentViewMargin(aBrowser); } else { this._roundContentView(aBrowser); @@ -539,10 +562,29 @@ class _RFPHelper { // 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); + + const borderDimensions = this.getBorderDimensions(aBrowser); + const marginDims = calcMargins(containerWidth, containerHeight - borderDimensions.top); + + let margins = { + top : 0, + right : 0, + bottom : 0, + left : 0, + }; + + // snap browser element to top + margins.top = 0; + // and leave 'double' margin at the bottom + margins.bottom = 2 * marginDims.height - borderDimensions.bottom; + // identical margins left and right + margins.right = marginDims.width - borderDimensions.right; + margins.left = marginDims.width - borderDimensions.left; + + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; // If the size of the content is already quantized, we do nothing. - if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + if (aBrowser.style.margin === marginStyleString) { log("_roundContentView[" + logId + "] is_rounded == true"); if (this._isLetterboxingTesting) { log( @@ -563,19 +605,35 @@ class _RFPHelper { "_roundContentView[" + logId + "] setting margins to " + - margins.width + - " x " + - margins.height + marginStyleString ); - // 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`; + + // The margin background color is determined by the background color of the + // window's tabpanels#tabbrowser-tabpanels element + aBrowser.style.margin = marginStyleString; }); } _clearContentViewMargin(aBrowser) { + const borderDimensions = this.getBorderDimensions(aBrowser); + // set the margins such that the browser elements border is visible up top, but + // are rendered off-screen on the remaining sides + let margins = { + top : 0, + right : -borderDimensions.right, + bottom : -borderDimensions.bottom, + left : -borderDimensions.left, + }; + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; + + aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.style.margin = marginStyleString; + }); + } + + _removeLetterboxing(aBrowser) { aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.classList.remove("letterboxing"); aBrowser.style.margin = ""; }); } @@ -593,6 +651,11 @@ class _RFPHelper { aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.add("letterboxing"); + } + // Rounding the content viewport. this._updateMarginsForTabsInWindow(aWindow); } @@ -616,10 +679,17 @@ class _RFPHelper { tabBrowser.removeTabsProgressListener(this); aWindow.removeEventListener("TabOpen", this); - // Clear all margins and tooltip for all browsers. + // revert tabpanel's background colors to default + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.remove("letterboxing"); + } + + // and revert each browser element to default, + // restore default margins and remove letterboxing class for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._clearContentViewMargin(browser); + this._removeLetterboxing(browser); } }

1 0