Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-14 23:40:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

structural changes to support Iframes

Browse source
This commit is contained in:
Tim Kuehn 2013-07-12 20:19:48 -07:00
parent eaa20edcd7
commit e9888b299c
30 changed files with 1416 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/script/dom/eventtarget.rs
View file

@ -4,7 +4,7 @@
use dom::bindings::codegen::EventTargetBinding;
use dom::bindings::utils::{CacheableWrapper, WrapperCache, BindingObject, DerivedWrapper};
use script_task::{task_from_context, global_script_context};
use script_task::page_from_context;
use js::glue::RUST_OBJECT_TO_JSVAL;
use js::jsapi::{JSObject, JSContext, JSVal};
@ -22,12 +22,7 @@ impl EventTarget {
}
}
pub fn init_wrapper(@mut self) {
let script_context = global_script_context();
let cx = script_context.js_compartment.cx.ptr;
let owner = script_context.root_frame.get_ref().window;
let cache = owner.get_wrappercache();
let scope = cache.get_wrapper();
pub fn init_wrapper(@mut self, cx: *JSContext, scope: *JSObject) {
self.wrap_object_shared(cx, scope);
}
}
@ -45,9 +40,10 @@ impl CacheableWrapper for EventTarget {
impl BindingObject for EventTarget {
fn GetParentObject(&self, cx: *JSContext) -> @mut CacheableWrapper {
let script_context = task_from_context(cx);
let page = page_from_context(cx);
// TODO(tkuehn): This only handles top-level pages. Needs to handle subframes.
unsafe {
(*script_context).root_frame.get_ref().window as @mut CacheableWrapper
(*page).frame.get_ref().window as @mut CacheableWrapper
}
}
}