auto merge of #5459 : jdm/servo/reflowquery, r=saneyuki

This commit is contained in:
bors-servo 2015-04-01 14:03:43 -06:00
commit 6bedf4a229
2 changed files with 2 additions and 1 deletions

View file

@ -537,7 +537,7 @@ impl<'a> WindowHelpers for JSRef<'a, Window> {
debug!("script: performing reflow for goal {:?}", goal); debug!("script: performing reflow for goal {:?}", goal);
let root: JSRef<Node> = NodeCast::from_ref(root); 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"); debug!("root has no dirty descendants; avoiding reflow");
return return
} }

View file

@ -97,6 +97,7 @@ pub enum ReflowGoal {
} }
/// Any query to perform with this reflow. /// Any query to perform with this reflow.
#[derive(PartialEq)]
pub enum ReflowQueryType { pub enum ReflowQueryType {
NoQuery, NoQuery,
ContentBoxQuery(TrustedNodeAddress), ContentBoxQuery(TrustedNodeAddress),