aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/script/dom/bindings/node.rs7
-rw-r--r--src/components/script/dom/bindings/utils.rs19
-rw-r--r--src/components/script/dom/document.rs8
-rw-r--r--src/components/script/dom/domparser.rs3
-rw-r--r--src/components/script/dom/element.rs9
-rw-r--r--src/components/script/dom/htmldatalistelement.rs3
-rw-r--r--src/components/script/dom/htmldocument.rs3
-rw-r--r--src/components/script/dom/htmlfieldsetelement.rs3
-rw-r--r--src/components/script/dom/htmlformelement.rs3
-rw-r--r--src/components/script/dom/htmlmapelement.rs3
-rw-r--r--src/components/script/dom/window.rs4
11 files changed, 25 insertions, 40 deletions
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 59a1633c27b..696f0adbc90 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -118,15 +118,14 @@ impl Traceable for Node<ScriptView> {
}
debug!("tracing %s", name);
let mut node = node.unwrap();
- let cache = node.reflector();
- let wrapper = cache.get_jsobject();
- assert!(wrapper.is_not_null());
+ let obj = node.reflector().get_jsobject();
+ assert!(obj.is_not_null());
unsafe {
(*tracer).debugPrinter = ptr::null();
(*tracer).debugPrintIndex = -1;
do name.to_c_str().with_ref |name| {
(*tracer).debugPrintArg = name as *libc::c_void;
- JS_CallTracer(cast::transmute(tracer), wrapper, JSTRACE_OBJECT as u32);
+ JS_CallTracer(cast::transmute(tracer), obj, JSTRACE_OBJECT as u32);
}
}
}
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index b03fc5f89c3..56b28298a07 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -561,8 +561,8 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
value: @mut Reflectable,
vp: *mut JSVal) -> JSBool {
unsafe {
- let cache = value.reflector();
- let obj = cache.get_jsobject();
+ let reflector = value.reflector();
+ let obj = reflector.get_jsobject();
if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ {
*vp = RUST_OBJECT_TO_JSVAL(obj);
return 1; // JS_TRUE
@@ -574,7 +574,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
}
// MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx));
- cache.set_jsobject(obj);
+ reflector.set_jsobject(obj);
*vp = RUST_OBJECT_TO_JSVAL(obj);
return JS_WrapValue(cx, cast::transmute(vp));
}
@@ -584,14 +584,13 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Reflectable>) -> *JSObject {
match p {
Some(ref mut p) => {
- let cache = p.reflector();
- let wrapper = cache.get_jsobject();
- if wrapper.is_not_null() {
- return wrapper;
+ let obj = p.reflector().get_jsobject();
+ if obj.is_not_null() {
+ return obj;
}
- let wrapper = p.wrap_object_shared(cx, scope);
- cache.set_jsobject(wrapper);
- wrapper
+ let obj = p.wrap_object_shared(cx, scope);
+ p.reflector().set_jsobject(obj);
+ obj
}
None => unsafe { JS_GetGlobalObject(cx) }
}
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index c9dbace1c4b..ad197804348 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -162,9 +162,7 @@ impl BindingObject for AbstractDocument {
impl DerivedWrapper for AbstractDocument {
#[fixed_stack_segment]
fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
- let cache = self.reflector();
- let wrapper = cache.get_jsobject();
- unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
+ unsafe { *vp = RUST_OBJECT_TO_JSVAL(self.reflector().get_jsobject()) };
return 1;
}
@@ -229,9 +227,7 @@ impl Document {
fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
- (scope, cx)
+ (win.reflector().get_jsobject(), cx)
}
pub fn GetElementsByTagName(&self, tag: &DOMString) -> @mut HTMLCollection {
diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs
index ca80a958caf..15d1d7bcae3 100644
--- a/src/components/script/dom/domparser.rs
+++ b/src/components/script/dom/domparser.rs
@@ -27,8 +27,7 @@ impl DOMParser {
// TODO(tkuehn): This just handles the top-level page. Need to handle subframes.
let cx = owner.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = owner.reflector();
- let scope = cache.get_jsobject();
+ let scope = owner.reflector().get_jsobject();
parser.wrap_object_shared(cx, scope);
parser
}
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 9f653fa4e59..deb99f1fd26 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -191,8 +191,7 @@ impl<'self> Element {
let doc = self.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
}
@@ -287,8 +286,7 @@ impl Element {
match page.query_layout(ContentBoxesQuery(node, chan), port) {
ContentBoxesResponse(rects) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
let rects = do rects.map |r| {
ClientRect::new(
r.origin.y.to_f32(),
@@ -315,8 +313,7 @@ impl Element {
match page.query_layout(ContentBoxQuery(node, chan), port) {
ContentBoxResponse(rect) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
ClientRect::new(
rect.origin.y.to_f32(),
(rect.origin.y + rect.size.height).to_f32(),
diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs
index 65d84684959..b24f2712adb 100644
--- a/src/components/script/dom/htmldatalistelement.rs
+++ b/src/components/script/dom/htmldatalistelement.rs
@@ -17,8 +17,7 @@ impl HTMLDataListElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 4e9732499fb..d8ed4e28621 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -36,8 +36,7 @@ impl HTMLDocument {
fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.parent.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
}
diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs
index 57fc276d6b0..84b5a1166a1 100644
--- a/src/components/script/dom/htmlfieldsetelement.rs
+++ b/src/components/script/dom/htmlfieldsetelement.rs
@@ -43,8 +43,7 @@ impl HTMLFieldSetElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs
index c6db43401a7..9f08b77ac59 100644
--- a/src/components/script/dom/htmlformelement.rs
+++ b/src/components/script/dom/htmlformelement.rs
@@ -19,8 +19,7 @@ impl HTMLFormElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs
index a01d2bf45c6..9e33141d205 100644
--- a/src/components/script/dom/htmlmapelement.rs
+++ b/src/components/script/dom/htmlmapelement.rs
@@ -24,8 +24,7 @@ impl HTMLMapElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
- let cache = win.reflector();
- let scope = cache.get_jsobject();
+ let scope = win.reflector().get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 476263cf4b0..7bfbfa78391 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -225,9 +225,9 @@ impl Window {
};
unsafe {
- let cache = ptr::to_unsafe_ptr(win.reflector());
+ let reflector = ptr::to_unsafe_ptr(win.reflector());
win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope
- let global = (*cache).wrapper;
+ let global = (*reflector).wrapper;
do "window".to_c_str().with_ref |name| {
JS_DefineProperty(cx, global, name,
RUST_OBJECT_TO_JSVAL(global),
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 08:07:28 +0000