diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 02:04:28 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-07 02:04:28 +0530 |
| commit | c54558d5ef0ffbe7892ad1ba0c66bec6b0886fe1 (patch) | |
| tree | b645b4d9e4c07364a496668957942eecc3423866 | |
| parent | 69e6eb4d91ab1bd8f363ee7425e4f921ca006a1e (diff) | |
| parent | 558b0b6c29fb6255676bbc62ee7d8d8c4b8fa5e1 (diff) | |
| download | servo-c54558d5ef0ffbe7892ad1ba0c66bec6b0886fe1.tar.gz servo-c54558d5ef0ffbe7892ad1ba0c66bec6b0886fe1.zip | |
Auto merge of #8315 - asajeffrey:remove_child_dirty_parent, r=pcwalton
Dirty parent when removng a child node.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8315)
<!-- Reviewable:end -->
3 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index bd3e51a7e4d..d3eb716d05d 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -325,8 +325,8 @@ impl Node { node.layout_data.dispose(&node); } - let document = child.owner_doc(); - document.content_and_heritage_changed(child, NodeDamage::OtherNodeDamage); + self.owner_doc().content_and_heritage_changed(self, NodeDamage::OtherNodeDamage); + child.owner_doc().content_and_heritage_changed(child, NodeDamage::OtherNodeDamage); } } diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-000.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-000.htm.ini index f3a798f0b3b..158c6a78c65 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-000.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-000.htm.ini @@ -1,3 +1,3 @@ [block-in-inline-remove-000.htm] type: reftest - expected: FAIL + expected: PASS diff --git a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-002.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-002.htm.ini index 9e78926877a..b6dad7c5612 100644 --- a/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-002.htm.ini +++ b/tests/wpt/metadata-css/css21_dev/html4/block-in-inline-remove-002.htm.ini @@ -1,3 +1,3 @@ [block-in-inline-remove-002.htm] type: reftest - expected: FAIL + expected: PASS |