aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-04 12:19:00 -0800
committerGitHub <noreply@github.com>2017-01-04 12:19:00 -0800
commit2fe914e2fa68f44db903bc3de55d9823a44cdf0d (patch)
tree267cf07fb71ba6c82bf7c6d62431a8f113a55b38 /components/script/dom
parent6f9ff7b8bf66cbeb7d539c6728db05f05aa8f85c (diff)
parent9a264c8173501b2cbcc77895a1b66702fb69e5c6 (diff)
downloadservo-2fe914e2fa68f44db903bc3de55d9823a44cdf0d.tar.gz
servo-2fe914e2fa68f44db903bc3de55d9823a44cdf0d.zip
Auto merge of #14845 - jdm:restyle-ood, r=emilio
Avoid restyling elements that aren't in a document - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14480 - [X] There are tests for these changes <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14845) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 83dc980716c..d6d967db6c4 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -66,7 +66,7 @@ use dom::keyboardevent::KeyboardEvent;
use dom::location::Location;
use dom::messageevent::MessageEvent;
use dom::mouseevent::MouseEvent;
-use dom::node::{self, CloneChildrenFlag, Node, NodeDamage, window_from_node};
+use dom::node::{self, CloneChildrenFlag, Node, NodeDamage, window_from_node, IS_IN_DOC, LayoutNodeHelpers};
use dom::nodeiterator::NodeIterator;
use dom::nodelist::NodeList;
use dom::pagetransitionevent::PageTransitionEvent;
@@ -1788,7 +1788,12 @@ impl LayoutDocumentHelpers for LayoutJS<Document> {
#[allow(unrooted_must_root)]
unsafe fn drain_pending_restyles(&self) -> Vec<(LayoutJS<Element>, PendingRestyle)> {
let mut elements = (*self.unsafe_get()).pending_restyles.borrow_mut_for_layout();
- let result = elements.drain().map(|(k, v)| (k.to_layout(), v)).collect();
+ // Elements were in a document when they were adding to this list, but that
+ // may no longer be true when the next layout occurs.
+ let result = elements.drain()
+ .map(|(k, v)| (k.to_layout(), v))
+ .filter(|&(ref k, _)| k.upcast::<Node>().get_flag(IS_IN_DOC))
+ .collect();
result
}