From 0a82d68f3e8c6c0a0cbc72f39acc686c47557e3f Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 12 Nov 2015 10:11:36 -0700 Subject: [PATCH 1/2] Use the new device viewport size for constaints. Fixes #8443 --- components/style/selector_matching.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index 90748ed7be9..bb063c805e3 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -222,7 +222,7 @@ impl Stylist { .flat_map(|s| s.effective_rules(&self.device).viewport()) .cascade(); - self.viewport_constraints = ViewportConstraints::maybe_new(self.device.viewport_size, &cascaded_rule); + self.viewport_constraints = ViewportConstraints::maybe_new(device.viewport_size, &cascaded_rule); if let Some(ref constraints) = self.viewport_constraints { device = Device::new(MediaType::Screen, constraints.size); } From ef571ef507feacf42431bf82837a5916a1501066 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 12 Nov 2015 11:57:37 -0700 Subject: [PATCH 2/2] Add @SimonSapin's test case for #8443 --- tests/wpt/mozilla/meta/MANIFEST.json | 6 ++++ .../meta/css/meta_viewport_resize.html.ini | 4 +++ .../tests/css/meta_viewport_resize.html | 33 +++++++++++++++++++ .../css/meta_viewport_resize_iframe.html | 4 +++ 4 files changed, 47 insertions(+) create mode 100644 tests/wpt/mozilla/meta/css/meta_viewport_resize.html.ini create mode 100644 tests/wpt/mozilla/tests/css/meta_viewport_resize.html create mode 100644 tests/wpt/mozilla/tests/css/meta_viewport_resize_iframe.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index b349b7c5467..ab8bdf7ddb9 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -5628,6 +5628,12 @@ "url": "/_mozilla/css/float_relative_to_position.html" } ], + "css/meta_viewport_resize.html": [ + { + "path": "css/meta_viewport_resize.html", + "url": "/_mozilla/css/meta_viewport_resize.html" + } + ], "css/test_variable_legal_values.html": [ { "path": "css/test_variable_legal_values.html", diff --git a/tests/wpt/mozilla/meta/css/meta_viewport_resize.html.ini b/tests/wpt/mozilla/meta/css/meta_viewport_resize.html.ini new file mode 100644 index 00000000000..b5cbd6fcf52 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/meta_viewport_resize.html.ini @@ -0,0 +1,4 @@ +[meta_viewport_resize.html] + type: testharness + prefs: ["layout.viewport.enabled:true"] + diff --git a/tests/wpt/mozilla/tests/css/meta_viewport_resize.html b/tests/wpt/mozilla/tests/css/meta_viewport_resize.html new file mode 100644 index 00000000000..7cde945198d --- /dev/null +++ b/tests/wpt/mozilla/tests/css/meta_viewport_resize.html @@ -0,0 +1,33 @@ + + +Resizing the initial containing block dynamically with <meta name="viewport"> + https://github.com/servo/servo/issues/8443 + + + + diff --git a/tests/wpt/mozilla/tests/css/meta_viewport_resize_iframe.html b/tests/wpt/mozilla/tests/css/meta_viewport_resize_iframe.html new file mode 100644 index 00000000000..86de04da1bd --- /dev/null +++ b/tests/wpt/mozilla/tests/css/meta_viewport_resize_iframe.html @@ -0,0 +1,4 @@ + + +Test +