From 5e90299450c7241b2304786424c3461bde29da18 Mon Sep 17 00:00:00 2001 From: josiahdaniels Date: Sun, 12 Apr 2015 17:38:38 -0400 Subject: [PATCH] Use Page::window_for_script_deallocation in ScriptMemoryFailsafe Also: Rename window_for_script_dealloation to window_for_script_deallocation --- components/script/page.rs | 2 +- components/script/script_task.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/script/page.rs b/components/script/page.rs index cea2ddefc27..0a226211016 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -76,7 +76,7 @@ impl Page { Temporary::new(self.frame.borrow().as_ref().unwrap().window.clone()) } - pub fn window_for_script_dealloation(&self) -> Unrooted { + pub fn window_for_script_deallocation(&self) -> Unrooted { Unrooted::from_js(self.frame.borrow().as_ref().unwrap().window) } 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;