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

Rename some local variables and shorten some lines.

Browse source 
This was done manually, and might benefit from a more careful review.
This commit is contained in:
Bobby Holley 2013-10-09 09:53:23 +02:00
parent 622aa76515
commit 549ac6a29b
11 changed files with 25 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,15 +118,14 @@ impl Traceable for Node<ScriptView> {
} }
debug!("tracing %s", name); debug!("tracing %s", name);
let mut node = node.unwrap(); let mut node = node.unwrap();
let cache = node.reflector(); let obj = node.reflector().get_jsobject();
let wrapper = cache.get_jsobject(); assert!(obj.is_not_null());
assert!(wrapper.is_not_null());
unsafe { unsafe {
(*tracer).debugPrinter = ptr::null(); (*tracer).debugPrinter = ptr::null();
(*tracer).debugPrintIndex = -1; (*tracer).debugPrintIndex = -1;
do name.to_c_str().with_ref |name| { do name.to_c_str().with_ref |name| {
(*tracer).debugPrintArg = name as *libc::c_void; (*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);
} }
} }
} }

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

@ -561,8 +561,8 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
value: @mut Reflectable, value: @mut Reflectable,
vp: *mut JSVal) -> JSBool { vp: *mut JSVal) -> JSBool {
unsafe { unsafe {
let cache = value.reflector(); let reflector = value.reflector();
let obj = cache.get_jsobject(); let obj = reflector.get_jsobject();
if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ { if obj.is_not_null() /*&& js::GetObjectCompartment(obj) == js::GetObjectCompartment(scope)*/ {
*vp = RUST_OBJECT_TO_JSVAL(obj); *vp = RUST_OBJECT_TO_JSVAL(obj);
return 1; // JS_TRUE return 1; // JS_TRUE
@ -574,7 +574,7 @@ pub fn WrapNewBindingObject(cx: *JSContext, scope: *JSObject,
} }
// MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx)); // MOZ_ASSERT(js::IsObjectInContextCompartment(scope, cx));
cache.set_jsobject(obj); reflector.set_jsobject(obj);
*vp = RUST_OBJECT_TO_JSVAL(obj); *vp = RUST_OBJECT_TO_JSVAL(obj);
return JS_WrapValue(cx, cast::transmute(vp)); 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 { pub fn WrapNativeParent(cx: *JSContext, scope: *JSObject, mut p: Option<@mut Reflectable>) -> *JSObject {
match p { match p {
Some(ref mut p) => { Some(ref mut p) => {
let cache = p.reflector(); let obj = p.reflector().get_jsobject();
let wrapper = cache.get_jsobject(); if obj.is_not_null() {
if wrapper.is_not_null() { return obj;
return wrapper;
} }
let wrapper = p.wrap_object_shared(cx, scope); let obj = p.wrap_object_shared(cx, scope);
cache.set_jsobject(wrapper); p.reflector().set_jsobject(obj);
wrapper obj
} }
None => unsafe { JS_GetGlobalObject(cx) } None => unsafe { JS_GetGlobalObject(cx) }
} }

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

@ -162,9 +162,7 @@ impl BindingObject for AbstractDocument {
impl DerivedWrapper for AbstractDocument { impl DerivedWrapper for AbstractDocument {
#[fixed_stack_segment] #[fixed_stack_segment]
fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 { fn wrap(&mut self, _cx: *JSContext, _scope: *JSObject, vp: *mut JSVal) -> i32 {
let cache = self.reflector(); unsafe { *vp = RUST_OBJECT_TO_JSVAL(self.reflector().get_jsobject()) };
let wrapper = cache.get_jsobject();
unsafe { *vp = RUST_OBJECT_TO_JSVAL(wrapper) };
return 1; return 1;
} }
@ -229,9 +227,7 @@ impl Document {
fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.window.get_ref(); let win = self.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); (win.reflector().get_jsobject(), cx)
let scope = cache.get_jsobject();
(scope, cx)
} }
pub fn GetElementsByTagName(&self, tag: &DOMString) -> @mut HTMLCollection { pub fn GetElementsByTagName(&self, tag: &DOMString) -> @mut HTMLCollection {

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

@ -27,8 +27,7 @@ impl DOMParser {
// TODO(tkuehn): This just handles the top-level page. Need to handle subframes. // 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 cx = owner.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = owner.reflector(); let scope = owner.reflector().get_jsobject();
let scope = cache.get_jsobject();
parser.wrap_object_shared(cx, scope); parser.wrap_object_shared(cx, scope);
parser parser
} }

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

@ -191,8 +191,7 @@ impl<'self> Element {
let doc = self.node.owner_doc.unwrap(); let doc = self.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }
} }
@ -287,8 +286,7 @@ impl Element {
match page.query_layout(ContentBoxesQuery(node, chan), port) { match page.query_layout(ContentBoxesQuery(node, chan), port) {
ContentBoxesResponse(rects) => { ContentBoxesResponse(rects) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
let rects = do rects.map |r| { let rects = do rects.map |r| {
ClientRect::new( ClientRect::new(
r.origin.y.to_f32(), r.origin.y.to_f32(),
@ -315,8 +313,7 @@ impl Element {
match page.query_layout(ContentBoxQuery(node, chan), port) { match page.query_layout(ContentBoxQuery(node, chan), port) {
ContentBoxResponse(rect) => { ContentBoxResponse(rect) => {
let cx = page.js_info.get_ref().js_compartment.cx.ptr; let cx = page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
ClientRect::new( ClientRect::new(
rect.origin.y.to_f32(), rect.origin.y.to_f32(),
(rect.origin.y + rect.size.height).to_f32(), (rect.origin.y + rect.size.height).to_f32(),

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

@ -17,8 +17,7 @@ impl HTMLDataListElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap(); let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

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

@ -36,8 +36,7 @@ impl HTMLDocument {
fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) { fn get_scope_and_cx(&self) -> (*JSObject, *JSContext) {
let win = self.parent.window.get_ref(); let win = self.parent.window.get_ref();
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }
} }

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

@ -43,8 +43,7 @@ impl HTMLFieldSetElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap(); let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

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

@ -19,8 +19,7 @@ impl HTMLFormElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap(); let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

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

@ -24,8 +24,7 @@ impl HTMLMapElement {
let doc = self.htmlelement.element.node.owner_doc.unwrap(); let doc = self.htmlelement.element.node.owner_doc.unwrap();
let win = doc.with_base(|doc| doc.window.unwrap()); let win = doc.with_base(|doc| doc.window.unwrap());
let cx = win.page.js_info.get_ref().js_compartment.cx.ptr; let cx = win.page.js_info.get_ref().js_compartment.cx.ptr;
let cache = win.reflector(); let scope = win.reflector().get_jsobject();
let scope = cache.get_jsobject();
(scope, cx) (scope, cx)
} }

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

@ -225,9 +225,9 @@ impl Window {
}; };
unsafe { 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 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| { do "window".to_c_str().with_ref |name| {
JS_DefineProperty(cx, global, name, JS_DefineProperty(cx, global, name,
RUST_OBJECT_TO_JSVAL(global), RUST_OBJECT_TO_JSVAL(global),