mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Auto merge of #23529 - gatoWololo:omar_split_mutation_observer, r=ferjm
Split getter for mutation_observers() into two methods. Please let me know if these API changes look good: registered_mutation_observers() returns immutable references and does not init mutation observers. registered_mutation_observers_mut() lazily initializes raredata if it does not exist. Updated code that uses this methods to call appropriate method when mutation is not necessary. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #23286 <!-- Either: --> - [X] These changes do not require tests because: this is a small change to the API, and existing tests for Partial ShadowDOM support cover this API use/changes. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/23529) <!-- Reviewable:end -->
This commit is contained in:
commit
4c776f33d4
2 changed files with 21 additions and 9 deletions
|
@ -132,7 +132,12 @@ impl MutationObserver {
|
|||
|
||||
// Step 2 & 3
|
||||
for node in target.inclusive_ancestors(ShadowIncluding::No) {
|
||||
for registered in &*node.registered_mutation_observers() {
|
||||
let registered = node.registered_mutation_observers();
|
||||
if registered.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
for registered in &*registered.unwrap() {
|
||||
if &*node != target && !registered.options.subtree {
|
||||
continue;
|
||||
}
|
||||
|
@ -297,7 +302,7 @@ impl MutationObserverMethods for MutationObserver {
|
|||
// Step 7
|
||||
let add_new_observer = {
|
||||
let mut replaced = false;
|
||||
for registered in &mut *target.registered_mutation_observers() {
|
||||
for registered in &mut *target.registered_mutation_observers_mut() {
|
||||
if &*registered.observer as *const MutationObserver !=
|
||||
self as *const MutationObserver
|
||||
{
|
||||
|
|
|
@ -451,18 +451,25 @@ impl Node {
|
|||
cmp & NodeConstants::DOCUMENT_POSITION_PRECEDING != 0
|
||||
}
|
||||
|
||||
/// Return all registered mutation observers for this node.
|
||||
/// XXX(ferjm) This should probably be split into two functions,
|
||||
/// `registered_mutation_observers`, which returns an Option or
|
||||
/// an empty slice or something, and doesn't create the rare data,
|
||||
/// and `registered_mutation_observers_mut`, which does lazily
|
||||
/// initialize the raredata.
|
||||
pub fn registered_mutation_observers(&self) -> RefMut<Vec<RegisteredObserver>> {
|
||||
/// Return all registered mutation observers for this node. Lazily initialize the
|
||||
/// raredata if it does not exist.
|
||||
pub fn registered_mutation_observers_mut(&self) -> RefMut<Vec<RegisteredObserver>> {
|
||||
RefMut::map(self.ensure_rare_data(), |rare_data| {
|
||||
&mut rare_data.mutation_observers
|
||||
})
|
||||
}
|
||||
|
||||
pub fn registered_mutation_observers(&self) -> Option<Ref<Vec<RegisteredObserver>>> {
|
||||
let rare_data: Ref<_> = self.rare_data.borrow();
|
||||
|
||||
if rare_data.is_none() {
|
||||
return None;
|
||||
}
|
||||
Some(Ref::map(rare_data, |rare_data| {
|
||||
&rare_data.as_ref().unwrap().mutation_observers
|
||||
}))
|
||||
}
|
||||
|
||||
/// Add a new mutation observer for a given node.
|
||||
pub fn add_mutation_observer(&self, observer: RegisteredObserver) {
|
||||
self.ensure_rare_data().mutation_observers.push(observer);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue