Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to SM 39

Browse source
This commit is contained in:
Michael Wu 2015-04-06 19:27:56 -04:00
parent a256f39796
commit 675267b782
205 changed files with 6546 additions and 5340 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/domrectlist.rs
View file

@ -5,7 +5,7 @@
use dom::bindings::codegen::Bindings::DOMRectListBinding;
use dom::bindings::codegen::Bindings::DOMRectListBinding::DOMRectListMethods;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, Temporary};
use dom::bindings::js::{JS, Root};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::domrect::DOMRect;
use dom::window::Window;
@ -18,37 +18,37 @@ pub struct DOMRectList {
}
impl DOMRectList {
fn new_inherited<T>(window: JSRef<Window>, rects: T) -> DOMRectList
where T: Iterator<Item=Temporary<DOMRect>> {
fn new_inherited<T>(window: &Window, rects: T) -> DOMRectList
where T: Iterator<Item=Root<DOMRect>> {
DOMRectList {
reflector_: Reflector::new(),
rects: rects.map(JS::from_rooted).collect(),
window: JS::from_rooted(window),
rects: rects.map(|r| JS::from_rooted(&r)).collect(),
window: JS::from_ref(window),
}
}
pub fn new<T>(window: JSRef<Window>, rects: T) -> Temporary<DOMRectList>
where T: Iterator<Item=Temporary<DOMRect>> {
pub fn new<T>(window: &Window, rects: T) -> Root<DOMRectList>
where T: Iterator<Item=Root<DOMRect>> {
reflect_dom_object(box DOMRectList::new_inherited(window, rects),
GlobalRef::Window(window), DOMRectListBinding::Wrap)
}
}
impl<'a> DOMRectListMethods for JSRef<'a, DOMRectList> {
impl<'a> DOMRectListMethods for &'a DOMRectList {
fn Length(self) -> u32 {
self.rects.len() as u32
}
fn Item(self, index: u32) -> Option<Temporary<DOMRect>> {
fn Item(self, index: u32) -> Option<Root<DOMRect>> {
let rects = &self.rects;
if index < rects.len() as u32 {
Some(Temporary::from_rooted(rects[index as usize].clone()))
Some(rects[index as usize].root())
} else {
None
}
}
fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Temporary<DOMRect>> {
fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<DOMRect>> {
*found = index < self.rects.len() as u32;
self.Item(index)
}