From 2f9b057525ca116e33d96f114f809e83587c9631 Mon Sep 17 00:00:00 2001 From: Joel Einbinder Date: Wed, 19 May 2021 18:59:57 -0700 Subject: [PATCH] browser(firefox): partially revert scrollbars patch (#6670) --- browser_patches/firefox-stable/BUILD_NUMBER | 4 ++-- .../firefox-stable/juggler/components/juggler.js | 6 ++++++ browser_patches/firefox/BUILD_NUMBER | 4 ++-- browser_patches/firefox/juggler/components/juggler.js | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/browser_patches/firefox-stable/BUILD_NUMBER b/browser_patches/firefox-stable/BUILD_NUMBER index 7481406566..35777344fa 100644 --- a/browser_patches/firefox-stable/BUILD_NUMBER +++ b/browser_patches/firefox-stable/BUILD_NUMBER @@ -1,2 +1,2 @@ -1254 -Changed: max@schmitt.mx Di 18. Mai 21:21:37 CEST 2021 +1255 +Changed: joel.einbinder@gmail.com Wed 19 May 2021 06:54:50 PM PDT diff --git a/browser_patches/firefox-stable/juggler/components/juggler.js b/browser_patches/firefox-stable/juggler/components/juggler.js index caa0987930..7fd1ca3ad6 100644 --- a/browser_patches/firefox-stable/juggler/components/juggler.js +++ b/browser_patches/firefox-stable/juggler/components/juggler.js @@ -45,6 +45,12 @@ CommandLineHandler.prototype = { const loadFrameScript = () => { Services.mm.loadFrameScript(FRAME_SCRIPT, true /* aAllowDelayedLoad */); + if (Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo).isHeadless) { + const styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Components.interfaces.nsIStyleSheetService); + const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService); + const uri = ioService.newURI('chrome://juggler/content/content/hidden-scrollbars.css', null, null); + styleSheetService.loadAndRegisterSheet(uri, styleSheetService.AGENT_SHEET); + } }; // Force create hidden window here, otherwise its creation later closes the web socket! diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index f632510376..d6d50f6f72 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1264 -Changed: max@schmitt.mx Di 18. Mai 20:50:35 CEST 2021 +1265 +Changed: joel.einbinder@gmail.com Wed 19 May 2021 06:53:35 PM PDT diff --git a/browser_patches/firefox/juggler/components/juggler.js b/browser_patches/firefox/juggler/components/juggler.js index caa0987930..7fd1ca3ad6 100644 --- a/browser_patches/firefox/juggler/components/juggler.js +++ b/browser_patches/firefox/juggler/components/juggler.js @@ -45,6 +45,12 @@ CommandLineHandler.prototype = { const loadFrameScript = () => { Services.mm.loadFrameScript(FRAME_SCRIPT, true /* aAllowDelayedLoad */); + if (Cc["@mozilla.org/gfx/info;1"].getService(Ci.nsIGfxInfo).isHeadless) { + const styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Components.interfaces.nsIStyleSheetService); + const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService); + const uri = ioService.newURI('chrome://juggler/content/content/hidden-scrollbars.css', null, null); + styleSheetService.loadAndRegisterSheet(uri, styleSheetService.AGENT_SHEET); + } }; // Force create hidden window here, otherwise its creation later closes the web socket!