Bug 1431601 - Move getViewportInfo function into viewport_helpers.js. r=botond

Depends on D8317

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

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

dom/base/test/test_meta_viewport0.html

@@ -51,24 +51,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport1.html

@@ -47,24 +47,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport2.html

@@ -47,24 +47,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport3.html

@@ -49,24 +49,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport4.html

@@ -48,24 +48,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport5.html

@@ -24,24 +24,6 @@
       nextTest();
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport6.html

@@ -53,24 +53,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function nextTest() {
       if (tests.length)
         (tests.shift())();

dom/base/test/test_meta_viewport7.html

@@ -78,24 +78,6 @@
         });
     });
 
-    function getViewportInfo(aDisplayWidth, aDisplayHeight) {
-      let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
-          width = {}, height = {}, autoSize = {};
-
-      let cwu = SpecialPowers.getDOMWindowUtils(window);
-      cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
-                          minZoom, maxZoom, width, height, autoSize);
-      return {
-        defaultZoom: defaultZoom.value,
-        minZoom: minZoom.value,
-        maxZoom: maxZoom.value,
-        width: width.value,
-        height: height.value,
-        autoSize: autoSize.value,
-        allowZoom: allowZoom.value
-      };
-    }
-
     function updateViewport(content) {
       let meta = document.querySelector("meta[name=viewport]");
       meta.content = content;

dom/base/test/viewport_helpers.js

@@ -1,3 +1,21 @@
 function scaleRatio(scale) {
   return {"set": [["layout.css.devPixelsPerPx", "" + scale]]};
 }
+
+function getViewportInfo(aDisplayWidth, aDisplayHeight) {
+  let defaultZoom = {}, allowZoom = {}, minZoom = {}, maxZoom = {},
+      width = {}, height = {}, autoSize = {};
+
+  let cwu = SpecialPowers.getDOMWindowUtils(window);
+  cwu.getViewportInfo(aDisplayWidth, aDisplayHeight, defaultZoom, allowZoom,
+                      minZoom, maxZoom, width, height, autoSize);
+  return {
+    defaultZoom: defaultZoom.value,
+    minZoom: minZoom.value,
+    maxZoom: maxZoom.value,
+    width: width.value,
+    height: height.value,
+    autoSize: autoSize.value,
+    allowZoom: allowZoom.value
+  };
+}