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

Auto merge of #5657 - josiahdaniels:issue5654, r=jdm

Browse source 
Also: Rename window_for_script_dealloation to window_for_script_deallocation

#5654
This commit is contained in:
bors-servo 2015-04-13 00:03:00 -05:00
commit 9d027bab0a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/page.rs
View file

@ -76,7 +76,7 @@ impl Page {
Temporary::new(self.frame.borrow().as_ref().unwrap().window.clone())
}
pub fn window_for_script_dealloation(&self) -> Unrooted<Window> {
pub fn window_for_script_deallocation(&self) -> Unrooted<Window> {
Unrooted::from_js(self.frame.borrow().as_ref().unwrap().window)
}

4
components/script/script_task.rs
View file

@ -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;