Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed #4170 - Incremental reflow wasn't being aggressive enough when nodes get reparented.

Browse source 
When inserting a node that was already dirtied, the dirtying logic
would short circuit: "This node is already dirty? Great! Then its
parents must be HAS_DIRTY_DESCENDANTS, too! Let's skip that step."

This isn't appropriate when nodes move around the tree. In that case,
the node may be marked HAS_CHANGED, but ancestors may not yet have
the HAS_DIRTY_DESCENDANTS flag set.

This patch adds a `content_and_heritage_changed` hook in the document,
to deal with these cases appropriately.
This commit is contained in:
Clark Gaebel 2014-12-03 11:17:38 -08:00
parent 873ca6cadd
commit d3e4d29368
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/script/dom/node.rs
View file

@ -282,7 +282,7 @@ impl<'a> PrivateNodeHelpers for JSRef<'a, Node> {
let parent = self.parent_node().root();
parent.map(|parent| vtable_for(&*parent).child_inserted(self));
document.content_changed(self);
document.content_and_heritage_changed(self);
}
// http://dom.spec.whatwg.org/#node-is-removed
@ -436,6 +436,16 @@ pub trait NodeHelpers<'a> {
/// descendants as `IS_DIRTY`.
fn dirty(self);
/// Similar to `dirty`, but will always walk the ancestors to mark them dirty,
/// too. This is useful when a node is reparented. The node will frequently
/// already be marked as `changed` to skip double-dirties, but the ancestors
/// still need to be marked as `HAS_DIRTY_DESCENDANTS`.
///
/// See #4170
fn force_dirty_ancestors(self);
fn dirty_impl(self, force_ancestors: bool);
fn dump(self);
fn dump_indent(self, indent: uint);
fn debug_str(self) -> String;
@ -616,11 +626,19 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
self.set_flag(HAS_DIRTY_DESCENDANTS, state)
}
fn force_dirty_ancestors(self) {
self.dirty_impl(true)
}
fn dirty(self) {
self.dirty_impl(false)
}
fn dirty_impl(self, force_ancestors: bool) {
// 1. Dirty self.
self.set_has_changed(true);
if self.get_is_dirty() {
if self.get_is_dirty() && !force_ancestors {
return
}
@ -654,7 +672,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
// 4. Dirty ancestors.
for ancestor in self.ancestors() {
if ancestor.get_has_dirty_descendants() { break }
if !force_ancestors && ancestor.get_has_dirty_descendants() { break }
ancestor.set_has_dirty_descendants(true);
}
}
@ -1384,7 +1402,6 @@ impl Node {
// http://dom.spec.whatwg.org/#concept-node-replace-all
fn replace_all(node: Option<JSRef<Node>>, parent: JSRef<Node>) {
// Step 1.
match node {
Some(node) => {