diff options
author | josiahdaniels <josiahd6@gmail.com> | 2015-04-12 17:38:38 -0400 |
---|---|---|
committer | josiahdaniels <josiahd6@gmail.com> | 2015-04-12 17:38:38 -0400 |
commit | 5e90299450c7241b2304786424c3461bde29da18 (patch) | |
tree | 5403014db82292770122f112e39edb7f993310f4 /components/script/script_task.rs | |
parent | b019df892790cba347ba848d0e72e3c24a311c18 (diff) | |
download | servo-5e90299450c7241b2304786424c3461bde29da18.tar.gz servo-5e90299450c7241b2304786424c3461bde29da18.zip |
Use Page::window_for_script_deallocation in ScriptMemoryFailsafe
Also: Rename window_for_script_dealloation to window_for_script_deallocation
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r-- | components/script/script_task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 6334dcb26a0..93d176e3b18 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -25,7 +25,7 @@ use dom::bindings::codegen::InheritTypes::{ElementCast, EventTargetCast, HTMLIFr use dom::bindings::conversions::FromJSValConvertible; use dom::bindings::conversions::StringificationBehavior; use dom::bindings::js::{JS, JSRef, Temporary, OptionalRootable, RootedReference}; -use dom::bindings::js::{RootCollection, RootCollectionPtr, Unrooted}; +use dom::bindings::js::{RootCollection, RootCollectionPtr}; use dom::bindings::refcounted::{LiveDOMReferences, Trusted, TrustedReference}; use dom::bindings::structuredclone::StructuredCloneData; use dom::bindings::trace::{JSTraceable, trace_collections}; @@ -317,7 +317,7 @@ impl<'a> Drop for ScriptMemoryFailsafe<'a> { unsafe { let page = owner.page.borrow_for_script_deallocation(); for page in page.iter() { - let window = Unrooted::from_temporary(page.window()); + let window = page.window_for_script_deallocation(); (*window.unsafe_get()).clear_js_context_for_script_deallocation(); } *owner.js_context.borrow_for_script_deallocation() = None; |