aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/script/dom')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py6
-rw-r--r--src/components/script/dom/bindings/node.rs4
-rw-r--r--src/components/script/dom/bindings/utils.rs14
-rw-r--r--src/components/script/dom/document.rs4
-rw-r--r--src/components/script/dom/domparser.rs2
-rw-r--r--src/components/script/dom/element.rs6
-rw-r--r--src/components/script/dom/htmldatalistelement.rs2
-rw-r--r--src/components/script/dom/htmldocument.rs2
-rw-r--r--src/components/script/dom/htmlfieldsetelement.rs2
-rw-r--r--src/components/script/dom/htmlformelement.rs2
-rw-r--r--src/components/script/dom/htmlmapelement.rs2
11 files changed, 23 insertions, 23 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 5455ca8d4bb..bb2a779dd04 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2525,7 +2525,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
//NS_ADDREF(aObject);
- (*reflector).set_wrapper(obj);
+ (*reflector).set_jsobject(obj);
return obj;""" % (CreateBindingJSObject(self.descriptor, "parent"))
else:
@@ -2533,7 +2533,7 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
%s
let proto = GetProtoObject(aCx, obj, obj);
JS_SetPrototype(aCx, obj, proto);
- (*reflector).set_wrapper(obj);
+ (*reflector).set_jsobject(obj);
return obj;""" % CreateBindingJSObject(self.descriptor)
class CGWrapMethod(CGAbstractMethod):
@@ -4077,7 +4077,7 @@ class CGClassConstructHook(CGAbstractExternMethod):
// from the context for now.
let page = page_from_context(cx);
let global = (*page).frame.get_ref().window;
- let obj = global.reflector().get_wrapper();
+ let obj = global.reflector().get_jsobject();
"""
preArgs = ["global"]
diff --git a/src/components/script/dom/bindings/node.rs b/src/components/script/dom/bindings/node.rs
index 4e2297fd229..59a1633c27b 100644
--- a/src/components/script/dom/bindings/node.rs
+++ b/src/components/script/dom/bindings/node.rs
@@ -119,7 +119,7 @@ impl Traceable for Node<ScriptView> {
debug!("tracing %s", name);
let mut node = node.unwrap();
let cache = node.reflector();
- let wrapper = cache.get_wrapper();
+ let wrapper = cache.get_jsobject();
assert!(wrapper.is_not_null());
unsafe {
(*tracer).debugPrinter = ptr::null();
@@ -130,7 +130,7 @@ impl Traceable for Node<ScriptView> {
}
}
}
- debug!("tracing %p?:", self.wrapper.get_wrapper());
+ debug!("tracing %p?:", self.wrapper.get_jsobject());
trace_node(tracer, self.parent_node, "parent");
trace_node(tracer, self.first_child, "first child");
trace_node(tracer, self.last_child, "last child");
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index e59c007df96..b03fc5f89c3 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -537,11 +537,11 @@ pub struct Reflector {
}
impl Reflector {
- pub fn get_wrapper(&self) -> *JSObject {
+ pub fn get_jsobject(&self) -> *JSObject {
unsafe { cast::transmute(self.wrapper) }
}
- pub fn set_wrapper(&mut self, wrapper: *JSObject) {
+ pub fn set_jsobject(&mut self, wrapper: *JSObject) {
self.wrapper = wrapper;
}
@@ -562,7 +562,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
vp: *mut JSVal) -> JSBool {
unsafe {
let cache = value.reflector();
- let obj = cache.get_wrapper();
+ let obj = cache.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_wrapper(obj);
+ cache.set_jsobject(obj);
*vp = RUST_OBJECT_TO_JSVAL(obj);
return JS_WrapValue(cx, cast::transmute(vp));
}
@@ -585,12 +585,12 @@ pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Ref
match p {
Some(ref mut p) => {
let cache = p.reflector();
- let wrapper = cache.get_wrapper();
+ let wrapper = cache.get_jsobject();
if wrapper.is_not_null() {
return wrapper;
}
let wrapper = p.wrap_object_shared(cx, scope);
- cache.set_wrapper(wrapper);
+ cache.set_jsobject(wrapper);
wrapper
}
None => unsafe { JS_GetGlobalObject(cx) }
@@ -735,7 +735,7 @@ impl DerivedWrapper for AbstractNode<ScriptView> {
#[fixed_stack_segment]
fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
let cache = self.reflector();
- let wrapper = cache.get_wrapper();
+ let wrapper = cache.get_jsobject();
if wrapper.is_not_null() {
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1;
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 27bcd8f28b4..00aacc5fcfe 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -163,7 +163,7 @@ 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_wrapper();
+ let wrapper = cache.get_jsobject();
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1;
}
@@ -230,7 +230,7 @@ impl Document {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs
index d4b56af504c..ca80a958caf 100644
--- a/src/components/script/dom/domparser.rs
+++ b/src/components/script/dom/domparser.rs
@@ -28,7 +28,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_wrapper();
+ let scope = cache.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 86c429e55ec..9f653fa4e59 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -192,7 +192,7 @@ impl<'self> Element {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
}
@@ -288,7 +288,7 @@ impl Element {
ContentBoxesResponse(rects) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector();
- let scope = cache.get_wrapper();
+ let scope = cache.get_jsobject();
let rects = do rects.map |r| {
ClientRect::new(
r.origin.y.to_f32(),
@@ -316,7 +316,7 @@ impl Element {
ContentBoxResponse(rect) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector();
- let scope = cache.get_wrapper();
+ let scope = cache.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 b782403f13b..65d84684959 100644
--- a/src/components/script/dom/htmldatalistelement.rs
+++ b/src/components/script/dom/htmldatalistelement.rs
@@ -18,7 +18,7 @@ impl HTMLDataListElement {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 66f813dc9af..a023e01e863 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -37,7 +37,7 @@ impl HTMLDocument {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
}
diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs
index 285c6371f69..57fc276d6b0 100644
--- a/src/components/script/dom/htmlfieldsetelement.rs
+++ b/src/components/script/dom/htmlfieldsetelement.rs
@@ -44,7 +44,7 @@ impl HTMLFieldSetElement {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs
index 52ed2c44ac3..c6db43401a7 100644
--- a/src/components/script/dom/htmlformelement.rs
+++ b/src/components/script/dom/htmlformelement.rs
@@ -20,7 +20,7 @@ impl HTMLFormElement {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs
index 203008ccd7b..a01d2bf45c6 100644
--- a/src/components/script/dom/htmlmapelement.rs
+++ b/src/components/script/dom/htmlmapelement.rs
@@ -25,7 +25,7 @@ impl HTMLMapElement {
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_wrapper();
+ let scope = cache.get_jsobject();
(scope, cx)
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 06:42:17 +0000