aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/css/matching.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2015-11-02 14:00:52 -0800
committerPatrick Walton <pcwalton@mimiga.net>2015-11-03 13:12:45 -0800
commit3ae5f04bd19fae02ac43e64000ea73584f7f769d (patch)
tree212e64139df3c24e27bc85b1d0034b6b54dd41b8 /components/layout/css/matching.rs
parent1e3010e4cdb87a4a0ed07f541b5bd2f1872ccd5a (diff)
downloadservo-3ae5f04bd19fae02ac43e64000ea73584f7f769d.tar.gz
servo-3ae5f04bd19fae02ac43e64000ea73584f7f769d.zip
layout: Store viewport and screen size separately.
Fixes a bug whereby all nodes would get unconditionally reflowed on every layout event if the page set a viewport.
Diffstat (limited to 'components/layout/css/matching.rs')
-rw-r--r--components/layout/css/matching.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index 76a25671546..df2a65b8acc 100644
--- a/components/layout/css/matching.rs
+++ b/components/layout/css/matching.rs
@@ -463,7 +463,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
None => None,
Some(ref style) => Some(&**style),
};
- let (the_style, is_cacheable) = cascade(layout_context.screen_size,
+ let (the_style, is_cacheable) = cascade(layout_context.viewport_size,
applicable_declarations,
shareable,
Some(&***parent_style),
@@ -472,7 +472,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
this_style = the_style
}
None => {
- let (the_style, is_cacheable) = cascade(layout_context.screen_size,
+ let (the_style, is_cacheable) = cascade(layout_context.viewport_size,
applicable_declarations,
shareable,
None,