Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-23 08:34:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update Rust.

Browse source
This commit is contained in:
Ms2ger 2014-05-08 23:40:15 +02:00 • committed by Jack Moffitt
parent 3644d0272c
commit eaedeb07cb
184 changed files with 643 additions and 657 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/attr.rs
View file

@ -61,7 +61,7 @@ impl Attr {
name: DOMString, namespace: Namespace,
prefix: Option<DOMString>, owner: &JSRef<Element>) -> Temporary<Attr> {
let attr = Attr::new_inherited(local_name, value, name, namespace, prefix, owner);
reflect_dom_object(~attr, window, AttrBinding::Wrap)
reflect_dom_object(box attr, window, AttrBinding::Wrap)
}
pub fn set_value(&mut self, set_type: AttrSettingType, value: DOMString) {

2
src/components/script/dom/attrlist.rs
View file

@ -26,7 +26,7 @@ impl AttrList {
}
pub fn new(window: &JSRef<Window>, elem: &JSRef<Element>) -> Temporary<AttrList> {
reflect_dom_object(~AttrList::new_inherited(window, elem),
reflect_dom_object(box AttrList::new_inherited(window, elem),
window, AttrListBinding::Wrap)
}
}

2
src/components/script/dom/bindings/callback.rs
View file

@ -85,7 +85,7 @@ pub fn GetJSObjectFromCallback<T: CallbackContainer>(callback: &T) -> *JSObject
pub fn WrapCallThisObject<T: 'static + CallbackContainer + Reflectable>(cx: *JSContext,
_scope: *JSObject,
p: ~T) -> *JSObject {
p: Box<T>) -> *JSObject {
let obj = GetJSObjectFromCallback(p);
assert!(obj.is_not_null());

19
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1755,10 +1755,10 @@ class CGWrapMethod(CGAbstractMethod):
assert descriptor.interface.hasInterfacePrototypeObject()
if not descriptor.createGlobal:
args = [Argument('*JSContext', 'aCx'), Argument('&JSRef<Window>', 'aScope'),
Argument("~" + descriptor.concreteType, 'aObject', mutable=True)]
Argument("Box<%s>" % descriptor.concreteType, 'aObject', mutable=True)]
else:
args = [Argument('*JSContext', 'aCx'),
Argument("~" + descriptor.concreteType, 'aObject', mutable=True)]
Argument("Box<%s>" % descriptor.concreteType, 'aObject', mutable=True)]
retval = 'JS<%s>' % descriptor.concreteType
CGAbstractMethod.__init__(self, descriptor, 'Wrap', retval, args, pub=True)
@ -2609,7 +2609,7 @@ impl ToJSValConvertible for valuelist {
}
}
""" % (",\n ".join(map(getEnumValueName, enum.values())),
",\n ".join(['&"%s"' % val for val in enum.values()]))
",\n ".join(['"%s"' % val for val in enum.values()]))
self.cgRoot = CGList([
CGNamespace.build([enum.identifier.name + "Values"],
@ -3740,7 +3740,7 @@ class CGAbstractClassHook(CGAbstractExternMethod):
def finalizeHook(descriptor, hookName, context):
release = """let val = JS_GetReservedSlot(obj, dom_object_slot(obj));
let _: ~%s = cast::transmute(val.to_private());
let _: Box<%s> = cast::transmute(val.to_private());
debug!("%s finalize: {:p}", this);
""" % (descriptor.concreteType, descriptor.concreteType)
return release
@ -4221,7 +4221,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::js::{OptionalRootable, OptionalRootedRootable, ResultRootable}',
'dom::bindings::js::{OptionalRootedReference, OptionalOptionalRootedRootable}',
'dom::bindings::utils::{CreateDOMGlobal, CreateInterfaceObjects2}',
'dom::bindings::utils::{ConstantSpec, cx_for_dom_object, Default}',
'dom::bindings::utils::{ConstantSpec, cx_for_dom_object}',
'dom::bindings::utils::{dom_object_slot, DOM_OBJECT_SLOT, DOMClass}',
'dom::bindings::utils::{DOMJSClass, JSCLASS_DOM_GLOBAL}',
'dom::bindings::utils::{FindEnumStringIndex, GetArrayIndexFromId}',
@ -4258,7 +4258,6 @@ class CGBindingRoot(CGThing):
'std::cast',
'std::cmp',
'std::ptr',
'std::slice',
'std::str',
'std::num',
])
@ -4649,7 +4648,7 @@ class CGCallback(CGClass):
# And now insert our template argument.
argsWithoutThis = list(args)
args.insert(0, Argument("~T", "thisObj"))
args.insert(0, Argument("Box<T>", "thisObj"))
# And the self argument
method.args.insert(0, Argument(None, "&self"))
@ -4799,7 +4798,7 @@ class CallbackMember(CGNativeMember):
if self.argCount > 0:
replacements["argCount"] = self.argCountStr
replacements["argvDecl"] = string.Template(
"let mut argv = slice::from_elem(${argCount}, UndefinedValue());\n"
"let mut argv = Vec::from_elem(${argCount}, UndefinedValue());\n"
).substitute(replacements)
else:
# Avoid weird 0-sized arrays
@ -4886,7 +4885,7 @@ class CallbackMember(CGNativeMember):
result = argval
prepend = ""
conversion = prepend + wrapForType("argv[%s]" % jsvalIndex,
conversion = prepend + wrapForType("*argv.get_mut(%s)" % jsvalIndex,
result=result,
successCode="continue;" if arg.variadic else "break;")
if arg.variadic:
@ -4975,7 +4974,7 @@ class CallbackMethod(CallbackMember):
"getCallable": self.getCallableDecl()
}
if self.argCount > 0:
replacements["argv"] = "&argv[0]"
replacements["argv"] = "argv.as_ptr()"
replacements["argc"] = "argc"
else:
replacements["argv"] = "nullptr"

21
src/components/script/dom/bindings/js.rs
View file

@ -49,7 +49,6 @@ use script_task::StackRoots;
use std::cast;
use std::cell::RefCell;
use std::kinds::marker::ContravariantLifetime;
use std::local_data;
/// A type that represents a JS-owned value that is rooted for the lifetime of this value.
/// Importantly, it requires explicit rooting in order to interact with the inner value.
@ -94,12 +93,10 @@ impl<T: Reflectable> Temporary<T> {
/// Create a stack-bounded root for this value.
pub fn root<'a, 'b>(self) -> Root<'a, 'b, T> {
local_data::get(StackRoots, |opt| {
let collection = opt.unwrap();
unsafe {
(**collection).new_root(&self.inner)
}
})
let collection = StackRoots.get().unwrap();
unsafe {
(**collection).new_root(&self.inner)
}
}
unsafe fn inner(&self) -> JS<T> {
@ -162,12 +159,10 @@ impl<T: Reflectable> JS<T> {
/// Root this JS-owned value to prevent its collection as garbage.
pub fn root<'a, 'b>(&self) -> Root<'a, 'b, T> {
local_data::get(StackRoots, |opt| {
let collection = opt.unwrap();
unsafe {
(**collection).new_root(self)
}
})
let collection = StackRoots.get().unwrap();
unsafe {
(**collection).new_root(self)
}
}
}

8
src/components/script/dom/bindings/utils.rs
View file

@ -140,7 +140,7 @@ pub fn unwrap_jsmanaged<T: Reflectable>(mut obj: *JSObject,
}
}
pub unsafe fn squirrel_away_unique<T>(x: ~T) -> *T {
pub unsafe fn squirrel_away_unique<T>(x: Box<T>) -> *T {
cast::transmute(x)
}
@ -375,7 +375,7 @@ pub extern fn ThrowingConstructor(_cx: *JSContext, _argc: c_uint, _vp: *mut JSVa
}
pub fn initialize_global(global: *JSObject) {
let protoArray = ~([0 as *JSObject, ..PrototypeList::id::IDCount as uint]);
let protoArray = box () ([0 as *JSObject, ..PrototypeList::id::IDCount as uint]);
unsafe {
let box_ = squirrel_away_unique(protoArray);
JS_SetReservedSlot(global,
@ -390,9 +390,9 @@ pub trait Reflectable {
}
pub fn reflect_dom_object<T: Reflectable>
(obj: ~T,
(obj: Box<T>,
window: &JSRef<window::Window>,
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<window::Window>, ~T) -> JS<T>)
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<window::Window>, Box<T>) -> JS<T>)
-> Temporary<T> {
Temporary::new(wrap_fn(window.deref().get_cx(), window, obj))
}

2
src/components/script/dom/blob.rs
View file

@ -24,7 +24,7 @@ impl Blob {
}
pub fn new(window: &JSRef<Window>) -> Temporary<Blob> {
reflect_dom_object(~Blob::new_inherited(window),
reflect_dom_object(box Blob::new_inherited(window),
window,
BlobBinding::Wrap)
}

6
src/components/script/dom/characterdata.rs
View file

@ -70,7 +70,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
}
fn AppendData(&mut self, arg: DOMString) -> ErrorResult {
self.data.push_str(arg);
self.data = self.data + arg;
Ok(())
}
@ -92,10 +92,10 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} else {
count
};
let mut data = self.data.slice(0, offset as uint).to_owned();
let mut data = self.data.slice(0, offset as uint).to_strbuf();
data.push_str(arg);
data.push_str(self.data.slice((offset + count) as uint, length as uint));
self.data = data;
self.data = data.into_owned();
// FIXME: Once we have `Range`, we should implement step7 to step11
Ok(())
}

2
src/components/script/dom/clientrect.rs
View file

@ -36,7 +36,7 @@ impl ClientRect {
top: Au, bottom: Au,
left: Au, right: Au) -> Temporary<ClientRect> {
let rect = ClientRect::new_inherited(window, top, bottom, left, right);
reflect_dom_object(~rect, window, ClientRectBinding::Wrap)
reflect_dom_object(box rect, window, ClientRectBinding::Wrap)
}
}

2
src/components/script/dom/clientrectlist.rs
View file

@ -27,7 +27,7 @@ impl ClientRectList {
pub fn new(window: &JSRef<Window>,
rects: Vec<JSRef<ClientRect>>) -> Temporary<ClientRectList> {
reflect_dom_object(~ClientRectList::new_inherited(window, rects),
reflect_dom_object(box ClientRectList::new_inherited(window, rects),
window, ClientRectListBinding::Wrap)
}
}

2
src/components/script/dom/comment.rs
View file

@ -34,7 +34,7 @@ impl Comment {
pub fn new(text: DOMString, document: &JSRef<Document>) -> Temporary<Comment> {
let node = Comment::new_inherited(text, document);
Node::reflect_node(~node, document, CommentBinding::Wrap)
Node::reflect_node(box node, document, CommentBinding::Wrap)
}
pub fn Constructor(owner: &JSRef<Window>, data: DOMString) -> Fallible<Temporary<Comment>> {

2
src/components/script/dom/console.rs
View file

@ -21,7 +21,7 @@ impl Console {
}
pub fn new(window: &JSRef<Window>) -> Temporary<Console> {
reflect_dom_object(~Console::new_inherited(), window, ConsoleBinding::Wrap)
reflect_dom_object(box Console::new_inherited(), window, ConsoleBinding::Wrap)
}
}

24
src/components/script/dom/document.rs
View file

@ -179,9 +179,9 @@ impl<'a> DocumentHelpers for JSRef<'a, Document> {
}
impl Document {
pub fn reflect_document(document: ~Document,
pub fn reflect_document(document: Box<Document>,
window: &JSRef<Window>,
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<Window>, ~Document) -> JS<Document>)
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<Window>, Box<Document>) -> JS<Document>)
-> Temporary<Document> {
assert!(document.reflector().get_jsobject().is_null());
let mut raw_doc = reflect_dom_object(document, window, wrap_fn).root();
@ -230,7 +230,7 @@ impl Document {
pub fn new(window: &JSRef<Window>, url: Option<Url>, doctype: IsHTMLDocument, content_type: Option<DOMString>) -> Temporary<Document> {
let document = Document::new_inherited(window, url, doctype, content_type);
Document::reflect_document(~document, window, DocumentBinding::Wrap)
Document::reflect_document(box document, window, DocumentBinding::Wrap)
}
}
@ -541,7 +541,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
// http://www.whatwg.org/specs/web-apps/current-work/#document.title
fn Title(&self) -> DOMString {
let mut title = "".to_owned();
let mut title = StrBuf::new();
self.GetDocumentElement().root().map(|root| {
let root: &JSRef<Node> = NodeCast::from_ref(&*root);
root.traverse_preorder()
@ -555,7 +555,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
}
});
});
let v: Vec<&str> = title.words().collect();
let v: Vec<&str> = title.as_slice().words().collect();
let title = v.connect(" ");
title.trim().to_owned()
}
@ -693,7 +693,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"img" == elem.deref().local_name
}
}
let filter = ~ImagesFilter;
let filter = box ImagesFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -707,7 +707,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"embed" == elem.deref().local_name
}
}
let filter = ~EmbedsFilter;
let filter = box EmbedsFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -727,7 +727,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
elem.get_attribute(Null, "href").is_some()
}
}
let filter = ~LinksFilter;
let filter = box LinksFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -741,7 +741,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"form" == elem.deref().local_name
}
}
let filter = ~FormsFilter;
let filter = box FormsFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -755,7 +755,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"script" == elem.deref().local_name
}
}
let filter = ~ScriptsFilter;
let filter = box ScriptsFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -769,7 +769,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"a" == elem.deref().local_name && elem.get_attribute(Null, "name").is_some()
}
}
let filter = ~AnchorsFilter;
let filter = box AnchorsFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}
@ -783,7 +783,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
"applet" == elem.deref().local_name
}
}
let filter = ~AppletsFilter;
let filter = box AppletsFilter;
HTMLCollection::create(&*window, NodeCast::from_ref(self), filter)
}

2
src/components/script/dom/documentfragment.rs
View file

@ -33,7 +33,7 @@ impl DocumentFragment {
pub fn new(document: &JSRef<Document>) -> Temporary<DocumentFragment> {
let node = DocumentFragment::new_inherited(document);
Node::reflect_node(~node, document, DocumentFragmentBinding::Wrap)
Node::reflect_node(box node, document, DocumentFragmentBinding::Wrap)
}
pub fn Constructor(owner: &JSRef<Window>) -> Fallible<Temporary<DocumentFragment>> {

2
src/components/script/dom/documenttype.rs
View file

@ -48,7 +48,7 @@ impl DocumentType {
public_id,
system_id,
document);
Node::reflect_node(~documenttype, document, DocumentTypeBinding::Wrap)
Node::reflect_node(box documenttype, document, DocumentTypeBinding::Wrap)
}
}

2
src/components/script/dom/domexception.rs
View file

@ -50,7 +50,7 @@ impl DOMException {
}
pub fn new(window: &JSRef<Window>, code: DOMErrorName) -> Temporary<DOMException> {
reflect_dom_object(~DOMException::new_inherited(code), window, DOMExceptionBinding::Wrap)
reflect_dom_object(box DOMException::new_inherited(code), window, DOMExceptionBinding::Wrap)
}
}

2
src/components/script/dom/domimplementation.rs
View file

@ -34,7 +34,7 @@ impl DOMImplementation {
}
pub fn new(owner: &JSRef<Window>) -> Temporary<DOMImplementation> {
reflect_dom_object(~DOMImplementation::new_inherited(owner), owner,
reflect_dom_object(box DOMImplementation::new_inherited(owner), owner,
DOMImplementationBinding::Wrap)
}
}

2
src/components/script/dom/domparser.rs
View file

@ -26,7 +26,7 @@ impl DOMParser {
}
pub fn new(owner: &JSRef<Window>) -> Temporary<DOMParser> {
reflect_dom_object(~DOMParser::new_inherited(owner), owner,
reflect_dom_object(box DOMParser::new_inherited(owner), owner,
DOMParserBinding::Wrap)
}

2
src/components/script/dom/element.rs
View file

@ -155,7 +155,7 @@ impl Element {
pub fn new(local_name: DOMString, namespace: Namespace, prefix: Option<DOMString>, document: &JSRef<Document>) -> Temporary<Element> {
let element = Element::new_inherited(ElementTypeId, local_name, namespace, prefix, document);
Node::reflect_node(~element, document, ElementBinding::Wrap)
Node::reflect_node(box element, document, ElementBinding::Wrap)
}
}

2
src/components/script/dom/event.rs
View file

@ -82,7 +82,7 @@ impl Event {
}
pub fn new(window: &JSRef<Window>) -> Temporary<Event> {
reflect_dom_object(~Event::new_inherited(HTMLEventTypeId),
reflect_dom_object(box Event::new_inherited(HTMLEventTypeId),
window,
EventBinding::Wrap)
}

3
src/components/script/dom/eventtarget.rs
View file

@ -5,8 +5,7 @@
use dom::bindings::js::JSRef;
use dom::bindings::utils::{Reflectable, Reflector};
use dom::bindings::error::{Fallible, InvalidState};
use dom::bindings::codegen::BindingDeclarations::EventListenerBinding;
use self::EventListenerBinding::EventListener;
use dom::bindings::codegen::BindingDeclarations::EventListenerBinding::EventListener;
use dom::event::Event;
use dom::eventdispatcher::dispatch_event;
use dom::node::NodeTypeId;

2
src/components/script/dom/formdata.rs
View file

@ -38,7 +38,7 @@ impl FormData {
}
pub fn new(form: Option<JSRef<HTMLFormElement>>, window: &JSRef<Window>) -> Temporary<FormData> {
reflect_dom_object(~FormData::new_inherited(form, window), window, FormDataBinding::Wrap)
reflect_dom_object(box FormData::new_inherited(form, window), window, FormDataBinding::Wrap)
}
pub fn Constructor(window: &JSRef<Window>, form: Option<JSRef<HTMLFormElement>>) -> Fallible<Temporary<FormData>> {

2
src/components/script/dom/htmlanchorelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLAnchorElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLAnchorElement> {
let element = HTMLAnchorElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLAnchorElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLAnchorElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlappletelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLAppletElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLAppletElement> {
let element = HTMLAppletElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLAppletElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLAppletElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlareaelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLAreaElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLAreaElement> {
let element = HTMLAreaElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLAreaElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLAreaElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlaudioelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLAudioElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLAudioElement> {
let element = HTMLAudioElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLAudioElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLAudioElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlbaseelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLBaseElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLBaseElement> {
let element = HTMLBaseElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLBaseElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLBaseElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlbodyelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLBodyElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLBodyElement> {
let element = HTMLBodyElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLBodyElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLBodyElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlbrelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLBRElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLBRElement> {
let element = HTMLBRElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLBRElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLBRElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlbuttonelement.rs
View file

@ -35,7 +35,7 @@ impl HTMLButtonElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLButtonElement> {
let element = HTMLButtonElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLButtonElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLButtonElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlcanvaselement.rs
View file

@ -33,7 +33,7 @@ impl HTMLCanvasElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLCanvasElement> {
let element = HTMLCanvasElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLCanvasElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLCanvasElementBinding::Wrap)
}
}

17
src/components/script/dom/htmlcollection.rs
View file

@ -18,7 +18,7 @@ pub trait CollectionFilter {
fn filter(&self, elem: &JSRef<Element>, root: &JSRef<Node>) -> bool;
}
impl<S: Encoder<E>, E> Encodable<S, E> for ~CollectionFilter {
impl<S: Encoder<E>, E> Encodable<S, E> for Box<CollectionFilter> {
fn encode(&self, _s: &mut S) -> Result<(), E> {
Ok(())
}
@ -27,7 +27,7 @@ impl<S: Encoder<E>, E> Encodable<S, E> for ~CollectionFilter {
#[deriving(Encodable)]
pub enum CollectionTypeId {
Static(Vec<JS<Element>>),
Live(JS<Node>, ~CollectionFilter)
Live(JS<Node>, Box<CollectionFilter>)
}
#[deriving(Encodable)]
@ -47,13 +47,14 @@ impl HTMLCollection {
}
pub fn new(window: &JSRef<Window>, collection: CollectionTypeId) -> Temporary<HTMLCollection> {
reflect_dom_object(~HTMLCollection::new_inherited(window, collection),
reflect_dom_object(box HTMLCollection::new_inherited(window, collection),
window, HTMLCollectionBinding::Wrap)
}
}
impl HTMLCollection {
pub fn create(window: &JSRef<Window>, root: &JSRef<Node>, filter: ~CollectionFilter) -> Temporary<HTMLCollection> {
pub fn create(window: &JSRef<Window>, root: &JSRef<Node>,
filter: Box<CollectionFilter>) -> Temporary<HTMLCollection> {
HTMLCollection::new(window, Live(root.unrooted(), filter))
}
@ -70,7 +71,7 @@ impl HTMLCollection {
let filter = TagNameFilter {
tag: tag
};
HTMLCollection::create(window, root, ~filter)
HTMLCollection::create(window, root, box filter)
}
pub fn by_tag_name_ns(window: &JSRef<Window>, root: &JSRef<Node>, tag: DOMString,
@ -88,7 +89,7 @@ impl HTMLCollection {
tag: tag,
namespace: namespace
};
HTMLCollection::create(window, root, ~filter)
HTMLCollection::create(window, root, box filter)
}
pub fn by_class_name(window: &JSRef<Window>, root: &JSRef<Node>, classes: DOMString)
@ -104,7 +105,7 @@ impl HTMLCollection {
let filter = ClassNameFilter {
classes: split_html_space_chars(classes).map(|class| class.into_owned()).collect()
};
HTMLCollection::create(window, root, ~filter)
HTMLCollection::create(window, root, box filter)
}
pub fn children(window: &JSRef<Window>, root: &JSRef<Node>) -> Temporary<HTMLCollection> {
@ -114,7 +115,7 @@ impl HTMLCollection {
root.is_parent_of(NodeCast::from_ref(elem))
}
}
HTMLCollection::create(window, root, ~ElementChildFilter)
HTMLCollection::create(window, root, box ElementChildFilter)
}
}

2
src/components/script/dom/htmldataelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLDataElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLDataElement> {
let element = HTMLDataElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLDataElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLDataElementBinding::Wrap)
}
}

4
src/components/script/dom/htmldatalistelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLDataListElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLDataListElement> {
let element = HTMLDataListElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLDataListElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLDataListElementBinding::Wrap)
}
}
@ -50,7 +50,7 @@ impl<'a> HTMLDataListElementMethods for JSRef<'a, HTMLDataListElement> {
}
}
let node: &JSRef<Node> = NodeCast::from_ref(self);
let filter = ~HTMLDataListOptionsFilter;
let filter = box HTMLDataListOptionsFilter;
let window = window_from_node(node).root();
HTMLCollection::create(&*window, node, filter)
}

2
src/components/script/dom/htmldirectoryelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLDirectoryElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLDirectoryElement> {
let element = HTMLDirectoryElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLDirectoryElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLDirectoryElementBinding::Wrap)
}
}

2
src/components/script/dom/htmldivelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLDivElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLDivElement> {
let element = HTMLDivElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLDivElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLDivElementBinding::Wrap)
}
}

2
src/components/script/dom/htmldlistelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLDListElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLDListElement> {
let element = HTMLDListElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLDListElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLDListElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlelement.rs
View file

@ -41,7 +41,7 @@ impl HTMLElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLElement> {
let element = HTMLElement::new_inherited(HTMLElementTypeId, localName, document);
Node::reflect_node(~element, document, HTMLElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlembedelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLEmbedElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLEmbedElement> {
let element = HTMLEmbedElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLEmbedElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLEmbedElementBinding::Wrap)
}
}

4
src/components/script/dom/htmlfieldsetelement.rs
View file

@ -36,7 +36,7 @@ impl HTMLFieldSetElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLFieldSetElement> {
let element = HTMLFieldSetElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLFieldSetElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLFieldSetElementBinding::Wrap)
}
}
@ -92,7 +92,7 @@ impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> {
}
}
let node: &JSRef<Node> = NodeCast::from_ref(self);
let filter = ~ElementsFilter;
let filter = box ElementsFilter;
let window = window_from_node(node).root();
HTMLCollection::create(&*window, node, filter)
}

2
src/components/script/dom/htmlfontelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLFontElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLFontElement> {
let element = HTMLFontElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLFontElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLFontElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlformelement.rs
View file

@ -34,7 +34,7 @@ impl HTMLFormElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLFormElement> {
let element = HTMLFormElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLFormElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLFormElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlframeelement.rs
View file

@ -34,7 +34,7 @@ impl HTMLFrameElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLFrameElement> {
let element = HTMLFrameElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLFrameElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLFrameElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlframesetelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLFrameSetElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLFrameSetElement> {
let element = HTMLFrameSetElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLFrameSetElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLFrameSetElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlheadelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLHeadElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLHeadElement> {
let element = HTMLHeadElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLHeadElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLHeadElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlheadingelement.rs
View file

@ -44,7 +44,7 @@ impl HTMLHeadingElement {
pub fn new(localName: DOMString, document: &JSRef<Document>, level: HeadingLevel) -> Temporary<HTMLHeadingElement> {
let element = HTMLHeadingElement::new_inherited(localName, document, level);
Node::reflect_node(~element, document, HTMLHeadingElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLHeadingElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlhrelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLHRElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLHRElement> {
let element = HTMLHRElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLHRElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLHRElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlhtmlelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLHtmlElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLHtmlElement> {
let element = HTMLHtmlElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLHtmlElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLHtmlElementBinding::Wrap)
}
}

2
src/components/script/dom/htmliframeelement.rs
View file

@ -85,7 +85,7 @@ impl HTMLIFrameElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLIFrameElement> {
let element = HTMLIFrameElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLIFrameElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLIFrameElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlimageelement.rs
View file

@ -74,7 +74,7 @@ impl HTMLImageElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLImageElement> {
let element = HTMLImageElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLImageElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLImageElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlinputelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLInputElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLInputElement> {
let element = HTMLInputElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLInputElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLInputElementBinding::Wrap)
}
}

2
src/components/script/dom/htmllabelelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLLabelElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLLabelElement> {
let element = HTMLLabelElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLLabelElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLLabelElementBinding::Wrap)
}
}

2
src/components/script/dom/htmllegendelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLLegendElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLLegendElement> {
let element = HTMLLegendElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLLegendElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLLegendElementBinding::Wrap)
}
}

2
src/components/script/dom/htmllielement.rs
View file

@ -33,7 +33,7 @@ impl HTMLLIElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLLIElement> {
let element = HTMLLIElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLLIElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLLIElementBinding::Wrap)
}
}

2
src/components/script/dom/htmllinkelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLLinkElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLLinkElement> {
let element = HTMLLinkElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLLinkElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLLinkElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlmainelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLMainElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLMainElement> {
let element = HTMLMainElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLMainElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLMainElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlmapelement.rs
View file

@ -34,7 +34,7 @@ impl HTMLMapElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLMapElement> {
let element = HTMLMapElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLMapElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLMapElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlmetaelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLMetaElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLMetaElement> {
let element = HTMLMetaElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLMetaElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLMetaElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlmeterelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLMeterElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLMeterElement> {
let element = HTMLMeterElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLMeterElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLMeterElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlmodelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLModElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLModElement> {
let element = HTMLModElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLModElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLModElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlobjectelement.rs
View file

@ -47,7 +47,7 @@ impl HTMLObjectElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLObjectElement> {
let element = HTMLObjectElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLObjectElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLObjectElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlolistelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLOListElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLOListElement> {
let element = HTMLOListElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLOListElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLOListElementBinding::Wrap)
}
}

2
src/components/script/dom/htmloptgroupelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLOptGroupElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLOptGroupElement> {
let element = HTMLOptGroupElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLOptGroupElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLOptGroupElementBinding::Wrap)
}
}

2
src/components/script/dom/htmloptionelement.rs
View file

@ -34,7 +34,7 @@ impl HTMLOptionElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLOptionElement> {
let element = HTMLOptionElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLOptionElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLOptionElementBinding::Wrap)
}
}

2
src/components/script/dom/htmloutputelement.rs
View file

@ -35,7 +35,7 @@ impl HTMLOutputElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLOutputElement> {
let element = HTMLOutputElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLOutputElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLOutputElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlparagraphelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLParagraphElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLParagraphElement> {
let element = HTMLParagraphElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLParagraphElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLParagraphElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlparamelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLParamElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLParamElement> {
let element = HTMLParamElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLParamElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLParamElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlpreelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLPreElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLPreElement> {
let element = HTMLPreElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLPreElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLPreElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlprogresselement.rs
View file

@ -33,7 +33,7 @@ impl HTMLProgressElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLProgressElement> {
let element = HTMLProgressElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLProgressElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLProgressElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlquoteelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLQuoteElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLQuoteElement> {
let element = HTMLQuoteElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLQuoteElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLQuoteElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlscriptelement.rs
View file

@ -34,7 +34,7 @@ impl HTMLScriptElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLScriptElement> {
let element = HTMLScriptElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLScriptElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLScriptElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlselectelement.rs
View file

@ -37,7 +37,7 @@ impl HTMLSelectElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLSelectElement> {
let element = HTMLSelectElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLSelectElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLSelectElementBinding::Wrap)
}
}

10
src/components/script/dom/htmlserializer.rs
View file

@ -20,7 +20,7 @@ use dom::processinginstruction::ProcessingInstruction;
use dom::text::Text;
pub fn serialize(iterator: &mut NodeIterator) -> ~str {
let mut html = "".to_owned();
let mut html = StrBuf::new();
let mut open_elements: Vec<~str> = vec!();
for node in *iterator {
@ -62,7 +62,7 @@ pub fn serialize(iterator: &mut NodeIterator) -> ~str {
while open_elements.len() > 0 {
html.push_str("</".to_owned() + open_elements.pop().unwrap().as_slice() + ">");
}
html
html.into_owned()
}
fn serialize_comment(comment: &JSRef<Comment>) -> ~str {
@ -96,7 +96,9 @@ fn serialize_doctype(doctype: &JSRef<DocumentType>) -> ~str {
}
fn serialize_elem(elem: &JSRef<Element>, open_elements: &mut Vec<~str>) -> ~str {
let mut rv = "<".to_owned() + elem.deref().local_name;
let mut rv = StrBuf::new();
rv.push_str("<");
rv.push_str(elem.deref().local_name);
for attr in elem.deref().attrs.iter() {
let attr = attr.root();
rv.push_str(serialize_attr(&*attr));
@ -120,7 +122,7 @@ fn serialize_elem(elem: &JSRef<Element>, open_elements: &mut Vec<~str>) -> ~str
if !elem.deref().is_void() {
open_elements.push(elem.deref().local_name.clone());
}
rv
rv.into_owned()
}
fn serialize_attr(attr: &JSRef<Attr>) -> ~str {

2
src/components/script/dom/htmlsourceelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLSourceElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLSourceElement> {
let element = HTMLSourceElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLSourceElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLSourceElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlspanelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLSpanElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLSpanElement> {
let element = HTMLSpanElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLSpanElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLSpanElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlstyleelement.rs
View file

@ -36,7 +36,7 @@ impl HTMLStyleElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLStyleElement> {
let element = HTMLStyleElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLStyleElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLStyleElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltablecaptionelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTableCaptionElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableCaptionElement> {
let element = HTMLTableCaptionElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableCaptionElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableCaptionElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltablecolelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTableColElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableColElement> {
let element = HTMLTableColElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableColElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableColElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltabledatacellelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLTableDataCellElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableDataCellElement> {
let element = HTMLTableDataCellElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableDataCellElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableDataCellElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltableelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTableElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableElement> {
let element = HTMLTableElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltableheadercellelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLTableHeaderCellElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableHeaderCellElement> {
let element = HTMLTableHeaderCellElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableHeaderCellElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableHeaderCellElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltablerowelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTableRowElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableRowElement> {
let element = HTMLTableRowElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableRowElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableRowElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltablesectionelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTableSectionElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTableSectionElement> {
let element = HTMLTableSectionElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTableSectionElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTableSectionElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltemplateelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLTemplateElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTemplateElement> {
let element = HTMLTemplateElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTemplateElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTemplateElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltextareaelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTextAreaElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTextAreaElement> {
let element = HTMLTextAreaElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTextAreaElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTextAreaElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltimeelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTimeElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTimeElement> {
let element = HTMLTimeElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTimeElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTimeElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltitleelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTitleElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTitleElement> {
let element = HTMLTitleElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTitleElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTitleElementBinding::Wrap)
}
}

2
src/components/script/dom/htmltrackelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLTrackElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLTrackElement> {
let element = HTMLTrackElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLTrackElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLTrackElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlulistelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLUListElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLUListElement> {
let element = HTMLUListElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLUListElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLUListElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlunknownelement.rs
View file

@ -32,7 +32,7 @@ impl HTMLUnknownElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLUnknownElement> {
let element = HTMLUnknownElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLUnknownElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLUnknownElementBinding::Wrap)
}
}

2
src/components/script/dom/htmlvideoelement.rs
View file

@ -33,7 +33,7 @@ impl HTMLVideoElement {
pub fn new(localName: DOMString, document: &JSRef<Document>) -> Temporary<HTMLVideoElement> {
let element = HTMLVideoElement::new_inherited(localName, document);
Node::reflect_node(~element, document, HTMLVideoElementBinding::Wrap)
Node::reflect_node(box element, document, HTMLVideoElementBinding::Wrap)
}
}

2
src/components/script/dom/location.rs
View file

@ -30,7 +30,7 @@ impl Location {
}
pub fn new(window: &JSRef<Window>, page: Rc<Page>) -> Temporary<Location> {
reflect_dom_object(~Location::new_inherited(page),
reflect_dom_object(box Location::new_inherited(page),
window,
LocationBinding::Wrap)
}

2
src/components/script/dom/mouseevent.rs
View file

@ -52,7 +52,7 @@ impl MouseEvent {
}
pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<MouseEvent> {
reflect_dom_object(~MouseEvent::new_inherited(),
reflect_dom_object(box MouseEvent::new_inherited(),
window,
MouseEventBinding::Wrap)
}

2
src/components/script/dom/navigator.rs
View file

@ -22,7 +22,7 @@ impl Navigator {
}
pub fn new(window: &JSRef<Window>) -> Temporary<Navigator> {
reflect_dom_object(~Navigator::new_inherited(),
reflect_dom_object(box Navigator::new_inherited(),
window,
NavigatorBinding::Wrap)
}

14
src/components/script/dom/node.rs
View file

@ -169,7 +169,7 @@ impl LayoutDataRef {
}
}
pub unsafe fn from_data<T>(data: ~T) -> LayoutDataRef {
pub unsafe fn from_data<T>(data: Box<T>) -> LayoutDataRef {
LayoutDataRef {
data_cell: RefCell::new(Some(cast::transmute(data))),
}
@ -446,7 +446,7 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
/// Dumps the node tree, for debugging, with indentation.
fn dump_indent(&self, indent: uint) {
let mut s = "".to_owned();
let mut s = StrBuf::new();
for _ in range(0, indent) {
s.push_str(" ");
}
@ -887,9 +887,9 @@ fn as_uintptr<T>(t: &T) -> uintptr_t { t as *T as uintptr_t }
impl Node {
pub fn reflect_node<N: Reflectable+NodeBase>
(node: ~N,
(node: Box<N>,
document: &JSRef<Document>,
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<Window>, ~N) -> JS<N>)
wrap_fn: extern "Rust" fn(*JSContext, &JSRef<Window>, Box<N>) -> JS<N>)
-> Temporary<N> {
assert!(node.reflector().get_jsobject().is_null());
let window = document.deref().window.root();
@ -1513,14 +1513,14 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
match self.type_id {
DocumentFragmentNodeTypeId |
ElementNodeTypeId(..) => {
let mut content = "".to_owned();
let mut content = StrBuf::new();
for node in self.traverse_preorder() {
if node.is_text() {
let text: &JSRef<Text> = TextCast::to_ref(&node).unwrap();
content.push_str(text.deref().characterdata.data.as_slice());
}
}
Some(content)
Some(content.into_owned())
}
CommentNodeTypeId |
TextNodeTypeId |
@ -1560,7 +1560,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
{
let characterdata: &mut JSRef<CharacterData> = CharacterDataCast::to_mut_ref(self).unwrap();
characterdata.deref_mut().data = value.clone();
characterdata.deref_mut().data = value;
}
// Notify the document that the content of this node is different

2
src/components/script/dom/nodelist.rs
View file

@ -33,7 +33,7 @@ impl NodeList {
pub fn new(window: &JSRef<Window>,
list_type: NodeListType) -> Temporary<NodeList> {
reflect_dom_object(~NodeList::new_inherited(window, list_type),
reflect_dom_object(box NodeList::new_inherited(window, list_type),
window, NodeListBinding::Wrap)
}

2
src/components/script/dom/performance.rs
View file

@ -28,7 +28,7 @@ impl Performance {
pub fn new(window: &JSRef<Window>) -> Temporary<Performance> {
let performance = Performance::new_inherited(window);
reflect_dom_object(~performance, window, PerformanceBinding::Wrap)
reflect_dom_object(box performance, window, PerformanceBinding::Wrap)
}
}

2
src/components/script/dom/performancetiming.rs
View file

@ -27,7 +27,7 @@ impl PerformanceTiming {
pub fn new(window: &JSRef<Window>) -> Temporary<PerformanceTiming> {
let timing = PerformanceTiming::new_inherited(window.navigationStart,
window.navigationStartPrecise);
reflect_dom_object(~timing, window, PerformanceTimingBinding::Wrap)
reflect_dom_object(box timing, window, PerformanceTimingBinding::Wrap)
}
}

2
src/components/script/dom/processinginstruction.rs
View file

@ -34,7 +34,7 @@ impl ProcessingInstruction {
pub fn new(target: DOMString, data: DOMString, document: &JSRef<Document>) -> Temporary<ProcessingInstruction> {
let node = ProcessingInstruction::new_inherited(target, data, document);
Node::reflect_node(~node, document, ProcessingInstructionBinding::Wrap)
Node::reflect_node(box node, document, ProcessingInstructionBinding::Wrap)
}
}

2
src/components/script/dom/progressevent.rs
View file

@ -37,7 +37,7 @@ impl ProgressEvent {
pub fn new(window: &JSRef<Window>, type_: DOMString,
can_bubble: bool, cancelable: bool,
length_computable: bool, loaded: u64, total: u64) -> Temporary<ProgressEvent> {
let mut ev = reflect_dom_object(~ProgressEvent::new_inherited(length_computable, loaded, total),
let mut ev = reflect_dom_object(box ProgressEvent::new_inherited(length_computable, loaded, total),
window,
ProgressEventBinding::Wrap).root();
{

Some files were not shown because too many files have changed in this diff Show more