diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/document.rs | 13 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 34a7846b543..1fda0761c66 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -329,9 +329,16 @@ impl Document { } pub fn needs_reflow(&self) -> bool { - self.GetDocumentElement().is_some() && - (self.upcast::<Node>().get_has_dirty_descendants() || - !self.modified_elements.borrow().is_empty()) + // FIXME: This should check the dirty bit on the document, + // not the document element. Needs some layout changes to make + // that workable. + match self.GetDocumentElement() { + Some(root) => { + root.upcast::<Node>().get_has_dirty_descendants() || + !self.modified_elements.borrow().is_empty() + } + None => false, + } } /// Returns the first `base` element in the DOM that has an `href` attribute. diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 4cf2bbe881f..2910632a76f 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -966,7 +966,11 @@ impl Window { return } - self.force_reflow(goal, query_type, reason) + self.force_reflow(goal, query_type, reason); + + // If window_size is `None`, we don't reflow, so the document stays dirty. + // Otherwise, we shouldn't need a reflow immediately after a reflow. + assert!(!self.Document().needs_reflow() || self.window_size.get().is_none()); } pub fn layout(&self) -> &LayoutRPC { |