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

auto merge of #1116 : Ms2ger/servo/ClientRect, r=kmcallister

Browse source
This commit is contained in:
bors-servo 2013-10-24 06:01:15 -07:00
commit 86ec0a32f5
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
* 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::codegen::ClientRectBinding; use dom::bindings::codegen::ClientRectBinding;
use script_task::page_from_context; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::window::Window;
use js::jsapi::{JSObject, JSContext}; use js::jsapi::{JSObject, JSContext};
@ -14,23 +14,28 @@ pub struct ClientRect {
bottom: f32, bottom: f32,
left: f32, left: f32,
right: f32, right: f32,
window: @mut Window,
} }
impl ClientRect { impl ClientRect {
pub fn new(top: f32, bottom: f32, left: f32, right: f32, cx: *JSContext, scope: *JSObject) -> @mut ClientRect { pub fn new_inherited(window: @mut Window,
let rect = @mut ClientRect { top: f32, bottom: f32,
left: f32, right: f32) -> ClientRect {
ClientRect {
top: top, top: top,
bottom: bottom, bottom: bottom,
left: left, left: left,
right: right, right: right,
reflector_: Reflector::new() reflector_: Reflector::new(),
}; window: window,
rect.init_wrapper(cx, scope); }
rect
} }
pub fn init_wrapper(@mut self, cx: *JSContext, scope: *JSObject) { pub fn new(window: @mut Window,
self.wrap_object_shared(cx, scope); top: f32, bottom: f32,
left: f32, right: f32) -> @mut ClientRect {
let rect = ClientRect::new_inherited(window, top, bottom, left, right);
reflect_dom_object(@mut rect, window, ClientRectBinding::Wrap)
} }
pub fn Top(&self) -> f32 { pub fn Top(&self) -> f32 {
@ -67,14 +72,11 @@ impl Reflectable for ClientRect {
&mut self.reflector_ &mut self.reflector_
} }
fn wrap_object_shared(@mut self, cx: *JSContext, scope: *JSObject) -> *JSObject { fn wrap_object_shared(@mut self, _cx: *JSContext, _scope: *JSObject) -> *JSObject {
ClientRectBinding::Wrap(cx, scope, self) unreachable!();
} }
fn GetParentObject(&self, cx: *JSContext) -> Option<@mut Reflectable> { fn GetParentObject(&self, _cx: *JSContext) -> Option<@mut Reflectable> {
let page = page_from_context(cx); Some(self.window as @mut Reflectable)
unsafe {
Some((*page).frame.get_ref().window as @mut Reflectable)
}
} }
} }

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

@ -294,12 +294,11 @@ impl Element {
let scope = win.reflector().get_jsobject(); let scope = win.reflector().get_jsobject();
let rects = do rects.map |r| { let rects = do rects.map |r| {
ClientRect::new( ClientRect::new(
r.origin.y.to_f32().unwrap(), win,
(r.origin.y + r.size.height).to_f32().unwrap(), r.origin.y.to_f32().unwrap(),
r.origin.x.to_f32().unwrap(), (r.origin.y + r.size.height).to_f32().unwrap(),
(r.origin.x + r.size.width).to_f32().unwrap(), r.origin.x.to_f32().unwrap(),
cx, (r.origin.x + r.size.width).to_f32().unwrap())
scope)
}; };
(rects, cx, scope) (rects, cx, scope)
}, },
@ -315,15 +314,12 @@ impl Element {
let (port, chan) = comm::stream(); let (port, chan) = comm::stream();
match win.page.query_layout(ContentBoxQuery(node, chan), port) { match win.page.query_layout(ContentBoxQuery(node, chan), port) {
ContentBoxResponse(rect) => { ContentBoxResponse(rect) => {
let cx = win.get_cx();
let scope = win.reflector().get_jsobject();
ClientRect::new( ClientRect::new(
win,
rect.origin.y.to_f32().unwrap(), rect.origin.y.to_f32().unwrap(),
(rect.origin.y + rect.size.height).to_f32().unwrap(), (rect.origin.y + rect.size.height).to_f32().unwrap(),
rect.origin.x.to_f32().unwrap(), rect.origin.x.to_f32().unwrap(),
(rect.origin.x + rect.size.width).to_f32().unwrap(), (rect.origin.x + rect.size.width).to_f32().unwrap())
cx,
scope)
} }
} }
} }