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

Factor out a helper for eagerly creating JS wrappers

Browse source
This commit is contained in:
Keegan McAllister 2013-10-21 13:31:48 -07:00
parent 797143a1d3
commit 30a9fb2f45
4 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/components/script/dom/bindings/utils.rs
View file

@ -5,6 +5,7 @@
use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList;
use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH;
use dom::bindings::node; use dom::bindings::node;
use dom::window;
use dom::node::{AbstractNode, ScriptView}; use dom::node::{AbstractNode, ScriptView};
use std::libc::c_uint; use std::libc::c_uint;
@ -544,6 +545,20 @@ pub trait Reflectable {
fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable>; fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable>;
} }
pub fn reflect_dom_object<T: Reflectable>
(obj: @mut T,
window: &window::Window,
wrap_fn: extern "Rust" fn(*JSContext, *JSObject, @mut T) -> *JSObject)
-> @mut T {
let cx = window.get_cx();
let scope = window.reflector().get_jsobject();
if wrap_fn(cx, scope, obj).is_null() {
fail!("Could not eagerly wrap object");
}
assert!(obj.reflector().get_jsobject().is_not_null());
obj
}
pub struct Reflector { pub struct Reflector {
object: *JSObject object: *JSObject
} }

11
src/components/script/dom/blob.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::utils::Fallible; use dom::bindings::utils::Fallible;
use dom::bindings::codegen::BlobBinding; use dom::bindings::codegen::BlobBinding;
use dom::window::Window; use dom::window::Window;
@ -23,14 +23,7 @@ impl Blob {
} }
pub fn new(window: @mut Window) -> @mut Blob { pub fn new(window: @mut Window) -> @mut Blob {
let blob = @mut Blob::new_inherited(window); reflect_dom_object(@mut Blob::new_inherited(window), window, BlobBinding::Wrap)
let cx = window.get_cx();
let scope = window.reflector().get_jsobject();
if BlobBinding::Wrap(cx, scope, blob).is_null() {
fail!("BlobBinding::Wrap failed");
}
assert!(blob.reflector().get_jsobject().is_not_null());
blob
} }
} }

11
src/components/script/dom/formdata.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::utils::{DOMString, null_str_as_empty}; use dom::bindings::utils::{DOMString, null_str_as_empty};
use dom::bindings::codegen::FormDataBinding; use dom::bindings::codegen::FormDataBinding;
use dom::blob::Blob; use dom::blob::Blob;
@ -33,14 +33,7 @@ impl FormData {
} }
pub fn new(window: @mut Window) -> @mut FormData { pub fn new(window: @mut Window) -> @mut FormData {
let formdata = @mut FormData::new_inherited(window); reflect_dom_object(@mut FormData::new_inherited(window), window, FormDataBinding::Wrap)
let cx = window.get_cx();
let scope = window.reflector().get_jsobject();
if FormDataBinding::Wrap(cx, scope, formdata).is_null() {
fail!("FormDataBinding::Wrap failed");
}
assert!(formdata.reflector().get_jsobject().is_not_null());
formdata
} }
pub fn Append(&mut self, name: &DOMString, value: @mut Blob, filename: Option<DOMString>) { pub fn Append(&mut self, name: &DOMString, value: @mut Blob, filename: Option<DOMString>) {

11
src/components/script/dom/navigator.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::utils::{Reflectable, Reflector}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::utils::{DOMString, Fallible}; use dom::bindings::utils::{DOMString, Fallible};
use dom::bindings::codegen::NavigatorBinding; use dom::bindings::codegen::NavigatorBinding;
use dom::window::Window; use dom::window::Window;
@ -22,14 +22,7 @@ impl Navigator {
} }
pub fn new(window: &Window) -> @mut Navigator { pub fn new(window: &Window) -> @mut Navigator {
let nav = @mut Navigator::new_inherited(); reflect_dom_object(@mut Navigator::new_inherited(), window, NavigatorBinding::Wrap)
let cx = window.get_cx();
let scope = window.reflector().get_jsobject();
if NavigatorBinding::Wrap(cx, scope, nav).is_null() {
fail!("NavigatorBinding::Wrap failed");
}
assert!(nav.reflector().get_jsobject().is_not_null());
nav
} }
pub fn DoNotTrack(&self) -> DOMString { pub fn DoNotTrack(&self) -> DOMString {