Merge BindingObject and Reflectable.

This commit is contained in:
Ms2ger 2013-10-18 17:02:16 +02:00
parent f585d218cb
commit 321e0373fa
23 changed files with 62 additions and 200 deletions

View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector, BindingObject};
use dom::bindings::utils::{Reflectable, Reflector};
use script_task::page_from_context;
use js::jsapi::{JSContext, JSObject};
@ -23,15 +23,6 @@ impl WindowProxy {
}
}
impl BindingObject for WindowProxy {
fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> {
let page = page_from_context(cx);
unsafe {
Some((*page).frame.get_ref().window as @mut Reflectable)
}
}
}
impl Reflectable for WindowProxy {
fn reflector<'a>(&'a self) -> &'a Reflector {
&self.reflector_
@ -44,4 +35,11 @@ impl Reflectable for WindowProxy {
fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
fail!("not yet implemented")
}
fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> {
let page = page_from_context(cx);
unsafe {
Some((*page).frame.get_ref().window as @mut Reflectable)
}
}
}