Bug 1500314 Part 2: Update test expectations. r=botond

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Brad Werth 2019-03-27 23:44:09 +00:00
parent 8737bf03f3
commit 00fe72de86
3 changed files with 5 additions and 22 deletions

View File

@ -18,24 +18,8 @@
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>

View File

@ -18,9 +18,8 @@
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>

View File

@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=982141
-->
<head>
<meta charset="utf-8">
<meta name="viewport" content="user-scalable=no">
<meta name="viewport" content="width=980, user-scalable=no">
<title>Test for Bug 982141, helper page</title>
<script type="application/javascript" src="apz_test_utils.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>