Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use #[dom_struct] on IterableIterator<T> (fixes #12811)

Browse source
This commit is contained in:
Anthony Ramine 2017-02-14 18:04:22 +01:00
parent 8bcf36b9a5
commit be000d3833
1 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/bindings/iterable.rs
View file

@ -11,11 +11,11 @@ use dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyAndVal
use dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyOrValueResult; use dom::bindings::codegen::Bindings::IterableIteratorBinding::IterableKeyOrValueResult;
use dom::bindings::error::Fallible; use dom::bindings::error::Fallible;
use dom::bindings::js::{JS, Root}; use dom::bindings::js::{JS, Root};
use dom::bindings::reflector::{Reflector, DomObject, MutDomObject, reflect_dom_object}; use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
use dom::globalscope::GlobalScope; use dom::globalscope::GlobalScope;
use js::conversions::ToJSValConvertible; use js::conversions::ToJSValConvertible;
use js::jsapi::{JSContext, JSObject, MutableHandleValue, MutableHandleObject, HandleValue}; use js::jsapi::{HandleValue, JSContext, JSObject, MutableHandleObject};
use js::jsval::UndefinedValue; use js::jsval::UndefinedValue;
use std::cell::Cell; use std::cell::Cell;
use std::ptr; use std::ptr;
@ -47,9 +47,7 @@ pub trait Iterable {
/// An iterator over the iterable entries of a given DOM interface. /// An iterator over the iterable entries of a given DOM interface.
//FIXME: #12811 prevents dom_struct with type parameters //FIXME: #12811 prevents dom_struct with type parameters
//#[dom_struct] #[dom_struct]
#[derive(DenyPublicFields, HeapSizeOf, JSTraceable)]
#[must_root]
pub struct IterableIterator<T: DomObject + JSTraceable + Iterable> { pub struct IterableIterator<T: DomObject + JSTraceable + Iterable> {
reflector: Reflector, reflector: Reflector,
iterable: JS<T>, iterable: JS<T>,
@ -57,28 +55,6 @@ pub struct IterableIterator<T: DomObject + JSTraceable + Iterable> {
index: Cell<u32>, index: Cell<u32>,
} }
impl<T: DomObject + JSTraceable + Iterable> DomObject for IterableIterator<T> {
fn reflector<'a>(&'a self) -> &'a Reflector {
&self.reflector
}
}
impl<T: DomObject + JSTraceable + Iterable> MutDomObject for IterableIterator<T> {
fn init_reflector(&mut self, obj: *mut JSObject) {
self.reflector.set_jsobject(obj);
}
}
impl<T: DomObject + JSTraceable + Iterable> ToJSValConvertible for IterableIterator<T> {
#[allow(unsafe_code)]
unsafe fn to_jsval(&self,
cx: *mut JSContext,
rval: MutableHandleValue) {
let object = DomObject::reflector(self).get_jsobject();
object.to_jsval(cx, rval)
}
}
impl<T: DomObject + JSTraceable + Iterable> IterableIterator<T> { impl<T: DomObject + JSTraceable + Iterable> IterableIterator<T> {
/// Create a new iterator instance for the provided iterable DOM interface. /// Create a new iterator instance for the provided iterable DOM interface.
pub fn new(iterable: &T, pub fn new(iterable: &T,