Bug 1500314 Part 2: Update test expectations. r=botond
☠☠ backed out by 62b9000a17c1 ☠ ☠
authorBrad Werth <bwerth@mozilla.com>
Fri, 22 Mar 2019 16:46:30 +0000
changeset 465749 38349ca764d764d99930bd94ae088072a4d93d1d
parent 465748 77cafd05c85c01998b90fac9d87e924040de1a90
child 465750 c59acf29813609e214c9ab6ac08a84bba078a411
push id35746
push usershindli@mozilla.com
push dateSat, 23 Mar 2019 09:46:24 +0000
treeherdermozilla-central@02b7484f316b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1500314
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1500314 Part 2: Update test expectations. r=botond Depends on D23531 Differential Revision: https://phabricator.services.mozilla.com/D24268
dom/base/test/test_meta_viewport_maximum_scale_2.html
dom/base/test/test_meta_viewport_no_width_and_negative_height.html
--- a/dom/base/test/test_meta_viewport_maximum_scale_2.html
+++ b/dom/base/test/test_meta_viewport_maximum_scale_2.html
@@ -13,31 +13,15 @@
   <p>maximum-scale=2</p>
   <script type="application/javascript">
     "use strict";
 
     add_task(async function maximum_scale_2() {
       await SpecialPowers.pushPrefEnv(scaleRatio(1.0));
 
       let info = getViewportInfo(800, 480);
-      // FIXME: Bug 1500314
-      // As of revision: 067a1c08f91d, width and height are 980 and 588
-      // respectively, that's because we are using
-      // gfxPrefs::DesktopViewportWidth for the case where neither width nor
-      // height is specified in viewport meta and no initial-scale is specified.
-      // That's odd, it should be fixed.
-      //
-      // From 'Resolve width value' in
-      // https://drafts.csswg.org/css-device-adapt/#resolve-width
-      //
-      // 1. If width and height are both auto, set width = initial-width
-      // 2. Otherwise, if width is auto, set
-      //    width = height * (initial-width / initial-height), or
-      //    width = initial-width if initial-height is 0.
-      //
-      // In this test case 1 should be applied.
-      todo_is(info.width, 800, "width should be the display width");
-      todo_is(info.height, 480, "height should be the display height");
+      is(info.width, 800, "width should be the display width");
+      is(info.height, 480, "height should be the display height");
       is(info.maxZoom, 2, "maximum-scale should be 2");
     });
   </script>
 </body>
 </html>
--- a/dom/base/test/test_meta_viewport_no_width_and_negative_height.html
+++ b/dom/base/test/test_meta_viewport_no_width_and_negative_height.html
@@ -13,15 +13,14 @@
   <p>height=-200</p>
   <script type="application/javascript">
     "use strict";
 
     add_task(async function negative_height() {
       await SpecialPowers.pushPrefEnv(scaleRatio(1.0));
 
       let info = getViewportInfo(800, 480);
-      // See comments in test_meta_viewport_maximum_scale_2.html.
-      todo_is(info.width, 800, "width should be the display width");
-      todo_is(info.height, 480, "height should be the display height");
+      is(info.width, 800, "width should be the display width");
+      is(info.height, 480, "height should be the display height");
     });
   </script>
 </body>
 </html>