aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/documenttype.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-06-19 16:46:55 -0600
committerbors-servo <metajack+bors@gmail.com>2015-06-19 16:46:55 -0600
commite7808c526c348fea5e3b48af70b7f1a066652097 (patch)
tree640b22869e8a7eb7d5657df3074f0b0ccd528c29 /components/script/dom/documenttype.rs
parenta256f39796270cd3a5f40f33eaa4e407117b0cc6 (diff)
parent675267b7822d2d6c30c0e36fc22e0191b741b973 (diff)
downloadservo-e7808c526c348fea5e3b48af70b7f1a066652097.tar.gz
servo-e7808c526c348fea5e3b48af70b7f1a066652097.zip
Auto merge of #6150 - servo:smupgrade3, r=mbrubeck
Upgrade to Spidermonkey 39 > 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 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6150) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/documenttype.rs')
-rw-r--r--components/script/dom/documenttype.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs
index b5fd4300b70..3de5397c206 100644
--- a/components/script/dom/documenttype.rs
+++ b/components/script/dom/documenttype.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::DocumentTypeBinding::DocumentTypeMethods;
use dom::bindings::codegen::InheritTypes::{DocumentTypeDerived, NodeCast};
use dom::bindings::codegen::UnionTypes::NodeOrString;
use dom::bindings::error::ErrorResult;
-use dom::bindings::js::{JSRef, Temporary};
+use dom::bindings::js::Root;
use dom::document::Document;
use dom::eventtarget::{EventTarget, EventTargetTypeId};
use dom::node::{Node, NodeHelpers, NodeTypeId};
@@ -35,7 +35,7 @@ impl DocumentType {
fn new_inherited(name: DOMString,
public_id: Option<DOMString>,
system_id: Option<DOMString>,
- document: JSRef<Document>)
+ document: &Document)
-> DocumentType {
DocumentType {
node: Node::new_inherited(NodeTypeId::DocumentType, document),
@@ -48,8 +48,8 @@ impl DocumentType {
pub fn new(name: DOMString,
public_id: Option<DOMString>,
system_id: Option<DOMString>,
- document: JSRef<Document>)
- -> Temporary<DocumentType> {
+ document: &Document)
+ -> Root<DocumentType> {
let documenttype = DocumentType::new_inherited(name,
public_id,
system_id,
@@ -73,7 +73,7 @@ impl DocumentType {
}
}
-impl<'a> DocumentTypeMethods for JSRef<'a, DocumentType> {
+impl<'a> DocumentTypeMethods for &'a DocumentType {
// https://dom.spec.whatwg.org/#dom-documenttype-name
fn Name(self) -> DOMString {
self.name.clone()
@@ -106,7 +106,7 @@ impl<'a> DocumentTypeMethods for JSRef<'a, DocumentType> {
// https://dom.spec.whatwg.org/#dom-childnode-remove
fn Remove(self) {
- let node: JSRef<Node> = NodeCast::from_ref(self);
+ let node = NodeCast::from_ref(self);
node.remove_self();
}
}