mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Remove DOMRectList and use sequences instead.
DOMRectList was removed last back in 2015. See https://www.w3.org/Bugs/Public/show_bug.cgi?id=26200 for details.
This commit is contained in:
parent
56435db820
commit
853c91781e
6 changed files with 7 additions and 77 deletions
|
@ -1,58 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* 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/. */
|
||||
|
||||
use dom::bindings::codegen::Bindings::DOMRectListBinding;
|
||||
use dom::bindings::codegen::Bindings::DOMRectListBinding::DOMRectListMethods;
|
||||
use dom::bindings::js::{JS, Root};
|
||||
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
||||
use dom::domrect::DOMRect;
|
||||
use dom::window::Window;
|
||||
use dom_struct::dom_struct;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct DOMRectList {
|
||||
reflector_: Reflector,
|
||||
rects: Vec<JS<DOMRect>>,
|
||||
}
|
||||
|
||||
impl DOMRectList {
|
||||
fn new_inherited<T>(rects: T) -> DOMRectList
|
||||
where T: Iterator<Item = Root<DOMRect>>
|
||||
{
|
||||
DOMRectList {
|
||||
reflector_: Reflector::new(),
|
||||
rects: rects.map(|r| JS::from_ref(&*r)).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new<T>(window: &Window, rects: T) -> Root<DOMRectList>
|
||||
where T: Iterator<Item = Root<DOMRect>>
|
||||
{
|
||||
reflect_dom_object(box DOMRectList::new_inherited(rects),
|
||||
window,
|
||||
DOMRectListBinding::Wrap)
|
||||
}
|
||||
}
|
||||
|
||||
impl DOMRectListMethods for DOMRectList {
|
||||
// https://drafts.fxtf.org/geometry/#dom-domrectlist-length
|
||||
fn Length(&self) -> u32 {
|
||||
self.rects.len() as u32
|
||||
}
|
||||
|
||||
// https://drafts.fxtf.org/geometry/#dom-domrectlist-item
|
||||
fn Item(&self, index: u32) -> Option<Root<DOMRect>> {
|
||||
let rects = &self.rects;
|
||||
if index < rects.len() as u32 {
|
||||
Some(Root::from_ref(&*rects[index as usize]))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
// check-tidy: no specs after this line
|
||||
fn IndexedGetter(&self, index: u32) -> Option<Root<DOMRect>> {
|
||||
self.Item(index)
|
||||
}
|
||||
}
|
|
@ -34,7 +34,6 @@ use dom::create::create_element;
|
|||
use dom::document::{Document, LayoutDocumentHelpers};
|
||||
use dom::documentfragment::DocumentFragment;
|
||||
use dom::domrect::DOMRect;
|
||||
use dom::domrectlist::DOMRectList;
|
||||
use dom::domtokenlist::DOMTokenList;
|
||||
use dom::event::Event;
|
||||
use dom::eventtarget::EventTarget;
|
||||
|
@ -1632,17 +1631,16 @@ impl ElementMethods for Element {
|
|||
}
|
||||
|
||||
// https://drafts.csswg.org/cssom-view/#dom-element-getclientrects
|
||||
fn GetClientRects(&self) -> Root<DOMRectList> {
|
||||
fn GetClientRects(&self) -> Vec<Root<DOMRect>> {
|
||||
let win = window_from_node(self);
|
||||
let raw_rects = self.upcast::<Node>().content_boxes();
|
||||
let rects = raw_rects.iter().map(|rect| {
|
||||
raw_rects.iter().map(|rect| {
|
||||
DOMRect::new(win.upcast(),
|
||||
rect.origin.x.to_f64_px(),
|
||||
rect.origin.y.to_f64_px(),
|
||||
rect.size.width.to_f64_px(),
|
||||
rect.size.height.to_f64_px())
|
||||
});
|
||||
DOMRectList::new(&win, rects)
|
||||
}).collect()
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/cssom-view/#dom-element-getboundingclientrect
|
||||
|
|
|
@ -272,7 +272,6 @@ pub mod dompoint;
|
|||
pub mod dompointreadonly;
|
||||
pub mod domquad;
|
||||
pub mod domrect;
|
||||
pub mod domrectlist;
|
||||
pub mod domrectreadonly;
|
||||
pub mod domstringmap;
|
||||
pub mod domtokenlist;
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* 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/. */
|
||||
|
||||
// http://dev.w3.org/fxtf/geometry/#DOMRectList
|
||||
[NoInterfaceObject, Exposed=(Window,Worker)]
|
||||
//[ArrayClass]
|
||||
interface DOMRectList {
|
||||
readonly attribute unsigned long length;
|
||||
getter DOMRect? item(unsigned long index);
|
||||
};
|
|
@ -81,7 +81,8 @@ interface Element : Node {
|
|||
|
||||
// http://dev.w3.org/csswg/cssom-view/#extensions-to-the-element-interface
|
||||
partial interface Element {
|
||||
DOMRectList getClientRects();
|
||||
sequence<DOMRect> getClientRects();
|
||||
[NewObject]
|
||||
DOMRect getBoundingClientRect();
|
||||
|
||||
void scroll(optional ScrollToOptions options);
|
||||
|
|
|
@ -82,6 +82,7 @@ partial interface Range {
|
|||
|
||||
// http://dev.w3.org/csswg/cssom-view/#extensions-to-the-range-interface
|
||||
partial interface Range {
|
||||
// DOMRectList? getClientRects();
|
||||
// sequence<DOMRect> getClientRects();
|
||||
// [NewObject]
|
||||
// DOMRect getBoundingClientRect();
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue