Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23013 - servo:rm-rooted-reference, r=jdm

Browse source 
Simplify RootedReference and make it specifically about slices

It's now called `DomSlice<T>`.

<!-- 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/23013)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-03-11 14:32:13 -04:00 • committed by GitHub
commit 90e5f6264c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 208 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/script_thread.rs
View file

@ -33,8 +33,8 @@ use crate::dom::bindings::conversions::{
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::num::Finite;
use crate::dom::bindings::reflector::DomObject;
use crate::dom::bindings::root::ThreadLocalStackRoots;
use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom, RootCollection};
use crate::dom::bindings::root::{RootedReference, ThreadLocalStackRoots};
use crate::dom::bindings::str::DOMString;
use crate::dom::bindings::structuredclone::StructuredCloneData;
use crate::dom::bindings::trace::JSTraceable;
@ -2248,7 +2248,7 @@ impl ScriptThread {
pipeline_id
);
},
Some(window) => window.History().r().activate_state(history_state_id, url),
Some(window) => window.History().activate_state(history_state_id, url),
}
}
@ -2264,7 +2264,7 @@ impl ScriptThread {
pipeline_id
);
},
Some(window) => window.History().r().remove_states(history_states),
Some(window) => window.History().remove_states(history_states),
}
}
@ -2707,7 +2707,7 @@ impl ScriptThread {
global_to_clone,
browsing_context_id,
top_level_browsing_context_id,
parent.r(),
parent.deref(),
opener,
);
self.window_proxies
@ -2753,8 +2753,8 @@ impl ScriptThread {
&window,
browsing_context_id,
top_level_browsing_context_id,
iframe.r().map(Castable::upcast),
parent.r(),
iframe.deref().map(Castable::upcast),
parent.deref(),
opener,
);
self.window_proxies