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

Auto merge of #21236 - emilio:mutation-observer, r=jdm

Browse source 
script: A couple mutation observer fixes.

I felt like doing Servo stuff while trying to catch Gecko intermittents :)

This fixes most of #21233. I haven't dug into the other test.

<!-- 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/21236)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-07-23 13:33:45 -04:00 • committed by GitHub
commit 41f9f85040
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/characterdata.rs
View file

@ -64,6 +64,7 @@ impl CharacterData {
#[inline] #[inline]
pub fn append_data(&self, data: &str) { pub fn append_data(&self, data: &str) {
self.queue_mutation_record();
self.data.borrow_mut().push_str(data); self.data.borrow_mut().push_str(data);
self.content_changed(); self.content_changed();
} }

10
components/script/dom/mutationobserver.rs
View file

@ -132,8 +132,8 @@ impl MutationObserver {
if *namespace != ns!() { if *namespace != ns!() {
continue; continue;
} }
if registered.options.attribute_filter.iter() if !registered.options.attribute_filter.iter()
.find(|s| &**s == &**name).is_some() { .any(|s| &**s == &**name) {
continue; continue;
} }
} }
@ -184,7 +184,7 @@ impl MutationObserver {
} }
// Step 4 // Step 4
for &(ref observer, ref paired_string) in &interested_observers { for (observer, paired_string) in interested_observers {
// Steps 4.1-4.7 // Steps 4.1-4.7
let record = match attr_type { let record = match attr_type {
Mutation::Attribute { ref name, ref namespace, .. } => { Mutation::Attribute { ref name, ref namespace, .. } => {
@ -193,10 +193,10 @@ impl MutationObserver {
} else { } else {
None None
}; };
MutationRecord::attribute_mutated(target, name, namespace, paired_string.clone()) MutationRecord::attribute_mutated(target, name, namespace, paired_string)
}, },
Mutation::CharacterData { .. } => { Mutation::CharacterData { .. } => {
MutationRecord::character_data_mutated(target, paired_string.clone()) MutationRecord::character_data_mutated(target, paired_string)
} }
Mutation::ChildList { ref added, ref removed, ref next, ref prev } => { Mutation::ChildList { ref added, ref removed, ref next, ref prev } => {
MutationRecord::child_list_mutated(target, *added, *removed, *next, *prev) MutationRecord::child_list_mutated(target, *added, *removed, *next, *prev)

11
tests/wpt/metadata/dom/nodes/MutationObserver-attributes.html.ini
View file

@ -1,11 +0,0 @@
[MutationObserver-attributes.html]
type: testharness
[attributes/attributeFilter Element.id/Element.className: update mutation]
expected: FAIL
[attributes/attributeFilter Element.id/Element.className: multiple filter update mutation]
expected: FAIL
[attributeFilter alone Element.id/Element.className: multiple filter update mutation]
expected: FAIL

12
tests/wpt/metadata/dom/nodes/MutationObserver-characterData.html.ini
View file

@ -1,12 +0,0 @@
[MutationObserver-characterData.html]
type: testharness
expected: TIMEOUT
[characterData Text.appendData: simple mutation]
expected: TIMEOUT
[characterData Text.appendData: empty string mutation]
expected: TIMEOUT
[characterData Text.appendData: null string mutation]
expected: TIMEOUT