diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-01 14:03:43 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-01 14:03:43 -0600 |
| commit | 6bedf4a229f07a9cce589466cb398cd5afdd382d (patch) | |
| tree | 075e536865b2974a6ce310b16b73ef65ada75bcf | |
| parent | afbc51a746af79f3daf14d77002a47967ef3d38e (diff) | |
| parent | a3c13d8a4031fb7e9bcabfd84d37082118deb9ff (diff) | |
| download | servo-6bedf4a229f07a9cce589466cb398cd5afdd382d.tar.gz servo-6bedf4a229f07a9cce589466cb398cd5afdd382d.zip | |
auto merge of #5459 : jdm/servo/reflowquery, r=saneyuki
| -rw-r--r-- | components/script/dom/window.rs | 2 | ||||
| -rw-r--r-- | components/script/layout_interface.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 08e526df282..4c7f6c107fa 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -537,7 +537,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> { debug!("script: performing reflow for goal {:?}", goal); let root: JSRef<Node> = NodeCast::from_ref(root); - if !root.get_has_dirty_descendants() { + if query_type == ReflowQueryType::NoQuery && !root.get_has_dirty_descendants() { debug!("root has no dirty descendants; avoiding reflow"); return } diff --git a/components/script/layout_interface.rs b/components/script/layout_interface.rs index a0062a287b6..e0671763b13 100644 --- a/components/script/layout_interface.rs +++ b/components/script/layout_interface.rs @@ -97,6 +97,7 @@ pub enum ReflowGoal { } /// Any query to perform with this reflow. +#[derive(PartialEq)] pub enum ReflowQueryType { NoQuery, ContentBoxQuery(TrustedNodeAddress), |