forked from mirrors/gecko-dev
> Here it is. > > ~~There's two major things that are unfinished here:~~ > - ~~Dealing with the unroot_must_root lint. I'm not sure about the value of this lint with the new rooting API.~~ Done. > - ~~Updating the Cargo.locks to point to the new SM and SM binding.~~ Done. > > I also included my fixes for the rust update, but these will disappear in a rebase. A rust update is necessary to support calling `Drop` on `Heap<T>` correctly when `Heap<T>` is inside a `Rc<T>`. Otherwise `&self` points to the wrong location. > > Incremental GC is disabled here. I'm not sure how to deal with the incremental barriers so that's left for later. > > Generational GC works. SM doesn't work without it. > > The biggest change here is to the rooting API. `Root` was made movable, and `Temporary` and `JSRef` was removed. Movable `Root`s means there's no need for `Temporary`, and `JSRef`s aren't needed generally since it can be assumed that being able to obtain a reference to a dom object means it's already rooted. References have their lifetime bound to the Roots that provided them. DOM objects that haven't passed through `reflect_dom_object` don't need to be rooted, and DOM objects that have passed through `reflect_dom_object` can't be obtained without being rooted through `native_from_reflector_jsmanaged` or `JS::<T>::root()`. > > Support for `Heap<T>` ended up messier than I expected. It's split into two commits, but only because it's a bit difficult to fold them together. Supporting `Heap<T>` properly requires that that `Heap::<T>::set()` be called on something that won't move. I removed the Copy and Clone trait from `Heap<T>` so `Cell` can't hold `Heap<T>` - only `UnsafeCell` can hold it. > > `CallbackObject` is a bit tricky - I moved all callbacks into `Rc<T>` in order to make sure that the pointer inside to a `*mut JSObject` doesn't move. This is necessary for supporting `Heap<T>`. > > `RootedCollectionSet` is very general purpose now. Anything with `JSTraceable` can be rooted by `RootedCollectionSet`/`RootedTraceable`. Right now, `RootedTraceable` is only used to hold down dom objects before they're fully attached to their reflector. I had to make a custom mechanism to dispatch the trace call - couldn't figure out how to get trait objects working for this case. > > This has been tested with the following zeal settings: > > GC after every allocation > JS_GC_ZEAL=2,1 > > GC after every 100 allocations (important for catching use-after-free bugs) > JS_GC_ZEAL=2,100 > > Verify pre barriers > JS_GC_ZEAL=4,1 > > Verify post barriers > JS_GC_ZEAL=11,1 Source-Repo: https://github.com/servo/servo Source-Revision: e7808c526c348fea5e3b48af70b7f1a066652097
119 lines
4 KiB
Rust
119 lines
4 KiB
Rust
/* 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::attr::Attr;
|
|
use dom::attr::AttrHelpers;
|
|
use dom::bindings::cell::DOMRefCell;
|
|
use dom::bindings::codegen::Bindings::AttrBinding::AttrMethods;
|
|
use dom::bindings::codegen::Bindings::HTMLObjectElementBinding;
|
|
use dom::bindings::codegen::Bindings::HTMLObjectElementBinding::HTMLObjectElementMethods;
|
|
use dom::bindings::codegen::InheritTypes::HTMLObjectElementDerived;
|
|
use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLElementCast};
|
|
use dom::bindings::js::Root;
|
|
use dom::document::Document;
|
|
use dom::element::AttributeHandlers;
|
|
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
|
use dom::element::ElementTypeId;
|
|
use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
|
|
use dom::node::{Node, NodeTypeId, NodeHelpers, window_from_node};
|
|
use dom::validitystate::ValidityState;
|
|
use dom::virtualmethods::VirtualMethods;
|
|
|
|
use net_traits::image::base::Image;
|
|
use util::str::DOMString;
|
|
use std::sync::Arc;
|
|
|
|
#[dom_struct]
|
|
pub struct HTMLObjectElement {
|
|
htmlelement: HTMLElement,
|
|
image: DOMRefCell<Option<Arc<Image>>>,
|
|
}
|
|
|
|
impl HTMLObjectElementDerived for EventTarget {
|
|
fn is_htmlobjectelement(&self) -> bool {
|
|
*self.type_id() ==
|
|
EventTargetTypeId::Node(
|
|
NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLObjectElement)))
|
|
}
|
|
}
|
|
|
|
impl HTMLObjectElement {
|
|
fn new_inherited(localName: DOMString,
|
|
prefix: Option<DOMString>,
|
|
document: &Document) -> HTMLObjectElement {
|
|
HTMLObjectElement {
|
|
htmlelement:
|
|
HTMLElement::new_inherited(HTMLElementTypeId::HTMLObjectElement, localName, prefix, document),
|
|
image: DOMRefCell::new(None),
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(localName: DOMString,
|
|
prefix: Option<DOMString>,
|
|
document: &Document) -> Root<HTMLObjectElement> {
|
|
let element = HTMLObjectElement::new_inherited(localName, prefix, document);
|
|
Node::reflect_node(box element, document, HTMLObjectElementBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
trait ProcessDataURL {
|
|
fn process_data_url(&self);
|
|
}
|
|
|
|
impl<'a> ProcessDataURL for &'a HTMLObjectElement {
|
|
// Makes the local `data` member match the status of the `data` attribute and starts
|
|
/// prefetching the image. This method must be called after `data` is changed.
|
|
fn process_data_url(&self) {
|
|
let elem = ElementCast::from_ref(*self);
|
|
|
|
// TODO: support other values
|
|
match (elem.get_attribute(&ns!(""), &atom!("type")).map(|x| x.r().Value()),
|
|
elem.get_attribute(&ns!(""), &atom!("data")).map(|x| x.r().Value())) {
|
|
(None, Some(_uri)) => {
|
|
// TODO(gw): Prefetch the image here.
|
|
}
|
|
_ => { }
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn is_image_data(uri: &str) -> bool {
|
|
static TYPES: &'static [&'static str] = &["data:image/png", "data:image/gif", "data:image/jpeg"];
|
|
TYPES.iter().any(|&type_| uri.starts_with(type_))
|
|
}
|
|
|
|
impl<'a> HTMLObjectElementMethods for &'a HTMLObjectElement {
|
|
fn Validity(self) -> Root<ValidityState> {
|
|
let window = window_from_node(self);
|
|
ValidityState::new(window.r())
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-object-type
|
|
make_getter!(Type);
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-object-type
|
|
make_setter!(SetType, "type");
|
|
}
|
|
|
|
impl<'a> VirtualMethods for &'a HTMLObjectElement {
|
|
fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> {
|
|
let htmlelement: &&HTMLElement = HTMLElementCast::from_borrowed_ref(self);
|
|
Some(htmlelement as &VirtualMethods)
|
|
}
|
|
|
|
fn after_set_attr(&self, attr: &Attr) {
|
|
if let Some(ref s) = self.super_type() {
|
|
s.after_set_attr(attr);
|
|
}
|
|
|
|
match attr.local_name() {
|
|
&atom!("data") => {
|
|
self.process_data_url();
|
|
},
|
|
_ => ()
|
|
}
|
|
}
|
|
}
|
|
|