Bug 1603494: Allow global zoom values to be read from CPS when site specific zoom is disabled. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D62830

--HG--
extra : moz-landing-system : lando

browser/base/content/browser-fullZoom.js

@@ -417,7 +417,7 @@ var FullZoom = {
     let token = this._getBrowserToken(browser);
     let result = ZoomUI.getGlobalValue().then(value => {
       if (token.isCurrent) {
-        ZoomManager.setZoomForBrowser(browser, value === undefined ? 1 : value);
+        ZoomManager.setZoomForBrowser(browser, value);
         this._ignorePendingZoomAccesses(browser);
       }
     });
@@ -453,7 +453,7 @@ var FullZoom = {
     aBrowser,
     aCallback
   ) {
-    if (!this.siteSpecific || gInPrintPreviewMode) {
+    if (gInPrintPreviewMode) {
       this._executeSoon(aCallback);
       return;
     }
@@ -476,10 +476,7 @@ var FullZoom = {
     let token = this._getBrowserToken(aBrowser);
     ZoomUI.getGlobalValue().then(value => {
       if (token.isCurrent) {
-        ZoomManager.setZoomForBrowser(
-          aBrowser,
-          value === undefined ? 1 : value
-        );
+        ZoomManager.setZoomForBrowser(aBrowser, value);
         this._ignorePendingZoomAccesses(aBrowser);
       }
       this._executeSoon(aCallback);

browser/base/content/test/zoom/browser.ini

@@ -6,3 +6,4 @@ support-files =
 [browser_default_zoom_multitab.js]
 [browser_default_zoom_fission.js]
 skip-if = fission # Bug 1603282
+[browser_default_zoom_sitespecific.js]

browser/base/content/test/zoom/browser_default_zoom_sitespecific.js

@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+add_task(async function test_iframe_global_zoom() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.zoom.siteSpecific", false]],
+  });
+  const TEST_PAGE_URL = "https://example.org/";
+
+  // Prepare the test tabs
+  let tab2 = BrowserTestUtils.addTab(gBrowser);
+  let tabBrowser2 = gBrowser.getBrowserForTab(tab2);
+  await FullZoomHelper.selectTabAndWaitForLocationChange(tab2);
+  await FullZoomHelper.load(tab2, TEST_PAGE_URL);
+
+  let zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser2);
+  is(zoomLevel, 1, "tab 2 zoom has been set to 100%");
+
+  let tab1 = BrowserTestUtils.addTab(gBrowser);
+  let tabBrowser1 = gBrowser.getBrowserForTab(tab1);
+  await FullZoomHelper.selectTabAndWaitForLocationChange(tab1);
+  await FullZoomHelper.load(tab1, TEST_PAGE_URL);
+
+  await FullZoomHelper.selectTabAndWaitForLocationChange(tab1);
+  zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser1);
+  is(zoomLevel, 1, "tab 1 zoom has been set to 100%");
+
+  // 67% global zoom
+  await FullZoomHelper.changeDefaultZoom(67);
+  let defaultZoom = await FullZoomHelper.getGlobalValue();
+  is(defaultZoom, 0.67, "Global zoom is at 67%");
+
+  await TestUtils.waitForCondition(
+    () => ZoomManager.getZoomForBrowser(tabBrowser1) == 0.67
+  );
+  zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser1);
+  is(zoomLevel, 0.67, "tab 1 zoom has been set to 67%");
+
+  await FullZoom.enlarge();
+
+  zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser1);
+  is(zoomLevel, 0.8, "tab 1 zoom has been set to 80%");
+
+  await FullZoomHelper.selectTabAndWaitForLocationChange(tab2);
+  zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser2);
+  is(zoomLevel, 1, "tab 2 zoom remains 100%");
+
+  let tab3 = BrowserTestUtils.addTab(gBrowser);
+  let tabBrowser3 = gBrowser.getBrowserForTab(tab3);
+  await FullZoomHelper.selectTabAndWaitForLocationChange(tab3);
+  await FullZoomHelper.load(tab3, TEST_PAGE_URL);
+
+  zoomLevel = ZoomManager.getZoomForBrowser(tabBrowser3);
+  is(zoomLevel, 0.67, "tab 3 zoom has been set to 67%");
+
+  await FullZoomHelper.removeTabAndWaitForLocationChange();
+  await FullZoomHelper.removeTabAndWaitForLocationChange();
+  await FullZoomHelper.removeTabAndWaitForLocationChange();
+});