Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 22:34:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename get_wrappercache() to reflector(). v1

Browse source 
I also updated some variable names in the codegen.
This commit is contained in:
Bobby Holley 2013-10-08 20:36:56 +02:00
parent 2cbe2d7ce9
commit 62ddac8b6f
30 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2464,7 +2464,7 @@ class CGAbstractMethod(CGThing):
def CreateBindingJSObject(descriptor, parent=None):
if descriptor.proxy:
handler = """ //let cache = ptr::to_unsafe_ptr(aObject.get_wrappercache());
handler = """ //let reflector = ptr::to_unsafe_ptr(aObject.reflector());
let page = page_from_context(aCx);
let handler = (*page).js_info.get_ref().dom_static.proxy_handlers.get(&(PrototypeList::id::%s as uint));
@ -2520,20 +2520,20 @@ class CGWrapWithCacheMethod(CGAbstractMethod):
return ptr::null();
}
let cache = ptr::to_mut_unsafe_ptr(aObject.get_wrappercache());
let reflector = ptr::to_mut_unsafe_ptr(aObject.reflector());
%s
//NS_ADDREF(aObject);
(*cache).set_wrapper(obj);
(*reflector).set_wrapper(obj);
return obj;""" % (CreateBindingJSObject(self.descriptor, "parent"))
else:
return """ let cache = ptr::to_mut_unsafe_ptr(aObject.get_wrappercache());
return """ let reflector = ptr::to_mut_unsafe_ptr(aObject.reflector());
%s
let proto = GetProtoObject(aCx, obj, obj);
JS_SetPrototype(aCx, obj, proto);
(*cache).set_wrapper(obj);
(*reflector).set_wrapper(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.get_wrappercache().get_wrapper();
let obj = global.reflector().get_wrapper();
"""
preArgs = ["global"]

2
src/components/script/dom/bindings/domparser.rs
View file

@ -13,7 +13,7 @@ use js::glue::{RUST_OBJECT_TO_JSVAL};
use std::cast;
impl Reflectable for DOMParser {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

12
src/components/script/dom/bindings/element.rs
View file

@ -12,8 +12,8 @@ use js::jsapi::{JSContext, JSObject, JSTracer};
macro_rules! generate_cacheable_wrapper(
($name: path, $wrap: path) => (
impl Reflectable for $name {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.element.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.element.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
@ -27,8 +27,8 @@ macro_rules! generate_cacheable_wrapper(
macro_rules! generate_cacheable_wrapper_htmlelement(
($name: path, $wrap: path) => (
impl Reflectable for $name {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.htmlelement.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.htmlelement.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {
@ -42,8 +42,8 @@ macro_rules! generate_cacheable_wrapper_htmlelement(
macro_rules! generate_cacheable_wrapper_node(
($name: path, $wrap: path) => (
impl Reflectable for $name {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.node.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.node.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {

4
src/components/script/dom/bindings/node.rs
View file

@ -96,7 +96,7 @@ pub fn create(cx: *JSContext, node: &mut AbstractNode<ScriptView>) -> *JSObject
}
impl Reflectable for AbstractNode<ScriptView> {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
do self.with_mut_base |base| {
unsafe {
cast::transmute(&base.wrapper)
@ -118,7 +118,7 @@ impl Traceable for Node<ScriptView> {
}
debug!("tracing %s", name);
let mut node = node.unwrap();
let cache = node.get_wrappercache();
let cache = node.reflector();
let wrapper = cache.get_wrapper();
assert!(wrapper.is_not_null());
unsafe {

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

@ -528,7 +528,7 @@ pub fn initialize_global(global: *JSObject) {
}
pub trait Reflectable {
fn get_wrappercache(&mut self) -> &mut Reflector;
fn reflector(&mut self) -> &mut Reflector;
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject;
}
@ -561,7 +561,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
value: @mut Reflectable,
vp: *mut JSVal) -> JSBool {
unsafe {
let cache = value.get_wrappercache();
let cache = value.reflector();
let obj = cache.get_wrapper();
if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ {
*vp = RUST_OBJECT_TO_JSVAL(obj);
@ -584,7 +584,7 @@ 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.get_wrappercache();
let cache = p.reflector();
let wrapper = cache.get_wrapper();
if wrapper.is_not_null() {
return wrapper;
@ -734,7 +734,7 @@ pub trait DerivedWrapper {
impl DerivedWrapper for AbstractNode<ScriptView> {
#[fixed_stack_segment]
fn wrap(&mut self, cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
let cache = self.get_wrappercache();
let cache = self.reflector();
let wrapper = cache.get_wrapper();
if wrapper.is_not_null() {
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };

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

@ -23,7 +23,7 @@ impl Blob {
}
impl Reflectable for Blob {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

4
src/components/script/dom/characterdata.rs
View file

@ -58,8 +58,8 @@ impl CharacterData {
}
impl Reflectable for CharacterData {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.node.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.node.reflector()
}
fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {

2
src/components/script/dom/clientrect.rs
View file

@ -62,7 +62,7 @@ impl ClientRect {
}
impl Reflectable for ClientRect {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe {
cast::transmute(&self.wrapper)
}

2
src/components/script/dom/clientrectlist.rs
View file

@ -49,7 +49,7 @@ impl ClientRectList {
}
impl Reflectable for ClientRectList {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe {
cast::transmute(&self.wrapper)
}

10
src/components/script/dom/document.rs
View file

@ -132,9 +132,9 @@ impl WrappableDocument for Document {
}
impl Reflectable for AbstractDocument {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
do self.with_mut_base |doc| {
doc.get_wrappercache()
doc.reflector()
}
}
@ -162,7 +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.get_wrappercache();
let cache = self.reflector();
let wrapper = cache.get_wrapper();
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1;
@ -175,7 +175,7 @@ impl DerivedWrapper for AbstractDocument {
impl Reflectable for Document {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe {
cast::transmute(&self.wrapper)
}
@ -229,7 +229,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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}

2
src/components/script/dom/domparser.rs
View file

@ -27,7 +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.get_wrappercache();
let cache = owner.reflector();
let scope = cache.get_wrapper();
parser.wrap_object_shared(cx, scope);
parser

10
src/components/script/dom/element.rs
View file

@ -29,8 +29,8 @@ pub struct Element {
}
impl Reflectable for Element {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.node.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.node.reflector()
}
fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
@ -191,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}
@ -287,7 +287,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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
let rects = do rects.map |r| {
ClientRect::new(
@ -315,7 +315,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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
ClientRect::new(
rect.origin.y.to_f32(),

2
src/components/script/dom/event.rs
View file

@ -114,7 +114,7 @@ impl Event {
}
impl Reflectable for Event {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

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

@ -28,7 +28,7 @@ impl EventTarget {
}
impl Reflectable for EventTarget {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

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

@ -50,7 +50,7 @@ impl FormData {
}
impl Reflectable for FormData {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe {
cast::transmute(&self.wrapper)
}

2
src/components/script/dom/htmlcollection.rs
View file

@ -69,7 +69,7 @@ impl BindingObject for HTMLCollection {
}
impl Reflectable for HTMLCollection {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe {
cast::transmute(&self.wrapper)
}

2
src/components/script/dom/htmldatalistelement.rs
View file

@ -17,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}

6
src/components/script/dom/htmldocument.rs
View file

@ -36,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}
@ -201,8 +201,8 @@ impl HTMLDocument {
}
impl Reflectable for HTMLDocument {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.parent.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.parent.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {

4
src/components/script/dom/htmlelement.rs
View file

@ -149,8 +149,8 @@ impl HTMLElement {
}
impl Reflectable for HTMLElement {
fn get_wrappercache(&mut self) -> &mut Reflector {
self.element.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
self.element.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {

2
src/components/script/dom/htmlfieldsetelement.rs
View file

@ -43,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}

2
src/components/script/dom/htmlformelement.rs
View file

@ -19,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}

2
src/components/script/dom/htmlmapelement.rs
View file

@ -24,7 +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.get_wrappercache();
let cache = win.reflector();
let scope = cache.get_wrapper();
(scope, cx)
}

4
src/components/script/dom/mouseevent.rs
View file

@ -143,8 +143,8 @@ impl MouseEvent {
}
impl Reflectable for MouseEvent {
fn get_wrappercache(&mut self) -> &mut Reflector {
return self.parent.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
return self.parent.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {

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

@ -88,7 +88,7 @@ impl Navigator {
}
impl Reflectable for Navigator {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

2
src/components/script/dom/node.rs
View file

@ -790,7 +790,7 @@ impl VoidPtrLike for AbstractNode<LayoutView> {
}
impl Reflectable for Node<ScriptView> {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&mut self.wrapper) }
}

4
src/components/script/dom/uievent.rs
View file

@ -116,8 +116,8 @@ impl UIEvent {
}
impl Reflectable for UIEvent {
fn get_wrappercache(&mut self) -> &mut Reflector {
return self.parent.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
return self.parent.reflector()
}
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject {

2
src/components/script/dom/validitystate.rs
View file

@ -60,7 +60,7 @@ impl ValidityState {
}
impl Reflectable for ValidityState {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}

4
src/components/script/dom/window.rs
View file

@ -136,7 +136,7 @@ impl Window {
}
impl Reflectable for Window {
fn get_wrappercache(&mut self) -> &mut Reflector {
fn reflector(&mut self) -> &mut Reflector {
unsafe { cast::transmute(&self.wrapper) }
}
@ -225,7 +225,7 @@ impl Window {
};
unsafe {
let cache = ptr::to_unsafe_ptr(win.get_wrappercache());
let cache = ptr::to_unsafe_ptr(win.reflector());
win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope
let global = (*cache).wrapper;
do "window".to_c_str().with_ref |name| {

4
src/components/script/dom/windowproxy.rs
View file

@ -33,8 +33,8 @@ impl BindingObject for WindowProxy {
}
impl Reflectable for WindowProxy {
fn get_wrappercache(&mut self) -> &mut Reflector {
return self.get_wrappercache()
fn reflector(&mut self) -> &mut Reflector {
return self.reflector()
}
fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {

2
src/components/script/script_task.rs
View file

@ -707,7 +707,7 @@ impl ScriptTask {
self.chan.clone(),
self.compositor,
self.image_cache_task.clone());
page.initialize_js_info(cx, window.get_wrappercache().get_wrapper());
page.initialize_js_info(cx, window.reflector().get_wrapper());
RegisterBindings::Register(page.js_info.get_ref().js_compartment);