Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8496 - notriddle:master, r=jdm

Browse source 
Fix #8443

When there are viewport constraints, use the new window size to compute the viewport instead of the old one.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8496)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-30 03:03:05 +05:30
commit 210a243137
5 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/selector_matching.rs
View file

@ -222,7 +222,7 @@ impl<Impl: SelectorImplExt> Stylist<Impl> {
.flat_map(|s| s.effective_rules(&self.device).viewport()) .flat_map(|s| s.effective_rules(&self.device).viewport())
.cascade(); .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 { if let Some(ref constraints) = self.viewport_constraints {
device = Device::new(MediaType::Screen, constraints.size); device = Device::new(MediaType::Screen, constraints.size);
} }

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -5628,6 +5628,12 @@
"url": "/_mozilla/css/float_relative_to_position.html" "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": [ "css/test_variable_legal_values.html": [
{ {
"path": "css/test_variable_legal_values.html", "path": "css/test_variable_legal_values.html",

4
tests/wpt/mozilla/meta/css/meta_viewport_resize.html.ini Normal file
View file

@ -0,0 +1,4 @@
[meta_viewport_resize.html]
type: testharness
prefs: ["layout.viewport.enabled:true"]

33
tests/wpt/mozilla/tests/css/meta_viewport_resize.html Normal file
View file

@ -0,0 +1,33 @@
<!doctype html>
<meta charset=utf-8>
<title>Resizing the initial containing block dynamically with &lt;meta name="viewport">
https://github.com/servo/servo/issues/8443</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(function(t) {
var step2 = function() {
var iframe = document.getElementsByTagName("iframe")[0];
var body_style = iframe.contentWindow.getComputedStyle(iframe.contentDocument.body);
if (body_style.width === "500px") {
t.done();
} else {
window.requestAnimationFrame(step2);
}
};
var step1 = function() {
var iframe = document.getElementsByTagName("iframe")[0];
var body_style = iframe.contentWindow.getComputedStyle(iframe.contentDocument.body);
if (body_style.width === "400px") {
iframe.width = 500;
window.requestAnimationFrame(step2);
} else {
window.requestAnimationFrame(step1);
}
};
window.run = step1;
}, "<body> inside <iframe> has the <iframe>’s width");
</script>
<iframe src="meta_viewport_resize_iframe.html" onload="run()" width=400></iframe>

4
tests/wpt/mozilla/tests/css/meta_viewport_resize_iframe.html Normal file
View file

@ -0,0 +1,4 @@
<meta name="viewport" content="initial-scale=1.0">
<body style="margin: 0">
Test