diff options
Diffstat (limited to 'src/components/script/dom')
107 files changed, 169 insertions, 174 deletions
diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs index 4822de7eb07..68300bcb29f 100644 --- a/src/components/script/dom/attr.rs +++ b/src/components/script/dom/attr.rs @@ -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) { diff --git a/src/components/script/dom/attrlist.rs b/src/components/script/dom/attrlist.rs index e707a42b13f..8ed4dca07a4 100644 --- a/src/components/script/dom/attrlist.rs +++ b/src/components/script/dom/attrlist.rs @@ -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) } } diff --git a/src/components/script/dom/bindings/callback.rs b/src/components/script/dom/bindings/callback.rs index 1633ebb2411..96ddae184cc 100644 --- a/src/components/script/dom/bindings/callback.rs +++ b/src/components/script/dom/bindings/callback.rs @@ -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()); diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index ed1e78daf05..14a3cc1829e 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -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" diff --git a/src/components/script/dom/bindings/js.rs b/src/components/script/dom/bindings/js.rs index 8c33333e3cf..38fafe757a1 100644 --- a/src/components/script/dom/bindings/js.rs +++ b/src/components/script/dom/bindings/js.rs @@ -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) + } } } diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 7c742efcbb2..b263f8a46d6 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -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)) } diff --git a/src/components/script/dom/blob.rs b/src/components/script/dom/blob.rs index f4f22a26873..162a859acb1 100644 --- a/src/components/script/dom/blob.rs +++ b/src/components/script/dom/blob.rs @@ -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) } diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs index db9bb9cef73..63d961c10b7 100644 --- a/src/components/script/dom/characterdata.rs +++ b/src/components/script/dom/characterdata.rs @@ -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(()) } diff --git a/src/components/script/dom/clientrect.rs b/src/components/script/dom/clientrect.rs index 316269bfc56..65d648c9448 100644 --- a/src/components/script/dom/clientrect.rs +++ b/src/components/script/dom/clientrect.rs @@ -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) } } diff --git a/src/components/script/dom/clientrectlist.rs b/src/components/script/dom/clientrectlist.rs index d48cfadf2d7..6072b86df71 100644 --- a/src/components/script/dom/clientrectlist.rs +++ b/src/components/script/dom/clientrectlist.rs @@ -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) } } diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs index 896cfe47560..af64e4619e3 100644 --- a/src/components/script/dom/comment.rs +++ b/src/components/script/dom/comment.rs @@ -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>> { diff --git a/src/components/script/dom/console.rs b/src/components/script/dom/console.rs index a9c60962359..f385de9792c 100644 --- a/src/components/script/dom/console.rs +++ b/src/components/script/dom/console.rs @@ -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) } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 086ac778fdd..2ed144add2b 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -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) } diff --git a/src/components/script/dom/documentfragment.rs b/src/components/script/dom/documentfragment.rs index 07efa58e166..904a99753f5 100644 --- a/src/components/script/dom/documentfragment.rs +++ b/src/components/script/dom/documentfragment.rs @@ -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>> { diff --git a/src/components/script/dom/documenttype.rs b/src/components/script/dom/documenttype.rs index 98c7a5e1f86..8d759cff8cc 100644 --- a/src/components/script/dom/documenttype.rs +++ b/src/components/script/dom/documenttype.rs @@ -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) } } diff --git a/src/components/script/dom/domexception.rs b/src/components/script/dom/domexception.rs index 6d664cc0592..860e3f72be0 100644 --- a/src/components/script/dom/domexception.rs +++ b/src/components/script/dom/domexception.rs @@ -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) } } diff --git a/src/components/script/dom/domimplementation.rs b/src/components/script/dom/domimplementation.rs index 691d7ca4a81..91d2fa324d4 100644 --- a/src/components/script/dom/domimplementation.rs +++ b/src/components/script/dom/domimplementation.rs @@ -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) } } diff --git a/src/components/script/dom/domparser.rs b/src/components/script/dom/domparser.rs index c96da5cf0d1..746a5af21a5 100644 --- a/src/components/script/dom/domparser.rs +++ b/src/components/script/dom/domparser.rs @@ -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) } diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 5b8bd777468..c1fbc84af9d 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -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) } } diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs index 11eec04df39..450df543a38 100644 --- a/src/components/script/dom/event.rs +++ b/src/components/script/dom/event.rs @@ -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) } diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs index 17c8e19b45c..e1b8def7357 100644 --- a/src/components/script/dom/eventtarget.rs +++ b/src/components/script/dom/eventtarget.rs @@ -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; diff --git a/src/components/script/dom/formdata.rs b/src/components/script/dom/formdata.rs index 68d156be699..13f1a2de58b 100644 --- a/src/components/script/dom/formdata.rs +++ b/src/components/script/dom/formdata.rs @@ -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>> { diff --git a/src/components/script/dom/htmlanchorelement.rs b/src/components/script/dom/htmlanchorelement.rs index b2ee9c542f1..fcc6f200203 100644 --- a/src/components/script/dom/htmlanchorelement.rs +++ b/src/components/script/dom/htmlanchorelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlappletelement.rs b/src/components/script/dom/htmlappletelement.rs index d2867a2dda9..f4395fd6a65 100644 --- a/src/components/script/dom/htmlappletelement.rs +++ b/src/components/script/dom/htmlappletelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlareaelement.rs b/src/components/script/dom/htmlareaelement.rs index ff67ad69963..24f9c7e2789 100644 --- a/src/components/script/dom/htmlareaelement.rs +++ b/src/components/script/dom/htmlareaelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlaudioelement.rs b/src/components/script/dom/htmlaudioelement.rs index b95a39822a7..0926ac6b80e 100644 --- a/src/components/script/dom/htmlaudioelement.rs +++ b/src/components/script/dom/htmlaudioelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlbaseelement.rs b/src/components/script/dom/htmlbaseelement.rs index 8b035fca125..4548349b247 100644 --- a/src/components/script/dom/htmlbaseelement.rs +++ b/src/components/script/dom/htmlbaseelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlbodyelement.rs b/src/components/script/dom/htmlbodyelement.rs index eb8f70be9c2..37962f3c540 100644 --- a/src/components/script/dom/htmlbodyelement.rs +++ b/src/components/script/dom/htmlbodyelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlbrelement.rs b/src/components/script/dom/htmlbrelement.rs index 46e42c584c1..1e709703671 100644 --- a/src/components/script/dom/htmlbrelement.rs +++ b/src/components/script/dom/htmlbrelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlbuttonelement.rs b/src/components/script/dom/htmlbuttonelement.rs index 2034b8ba33a..5274097dd2e 100644 --- a/src/components/script/dom/htmlbuttonelement.rs +++ b/src/components/script/dom/htmlbuttonelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlcanvaselement.rs b/src/components/script/dom/htmlcanvaselement.rs index 4f7b185cbd1..7ae54440bab 100644 --- a/src/components/script/dom/htmlcanvaselement.rs +++ b/src/components/script/dom/htmlcanvaselement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index 82b0d54693f..f1cc1ef5aa5 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -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) } } diff --git a/src/components/script/dom/htmldataelement.rs b/src/components/script/dom/htmldataelement.rs index 4ed543aa600..49597b237a0 100644 --- a/src/components/script/dom/htmldataelement.rs +++ b/src/components/script/dom/htmldataelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index 6c8b2739c19..e56ded66fd7 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -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) } diff --git a/src/components/script/dom/htmldirectoryelement.rs b/src/components/script/dom/htmldirectoryelement.rs index f15deb2cdc4..38a90fafa1c 100644 --- a/src/components/script/dom/htmldirectoryelement.rs +++ b/src/components/script/dom/htmldirectoryelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmldivelement.rs b/src/components/script/dom/htmldivelement.rs index 726efe362b1..8f3875e914b 100644 --- a/src/components/script/dom/htmldivelement.rs +++ b/src/components/script/dom/htmldivelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmldlistelement.rs b/src/components/script/dom/htmldlistelement.rs index e6149ca91b6..26c236a3415 100644 --- a/src/components/script/dom/htmldlistelement.rs +++ b/src/components/script/dom/htmldlistelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs index 5355abcf732..f1ecec10e15 100644 --- a/src/components/script/dom/htmlelement.rs +++ b/src/components/script/dom/htmlelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlembedelement.rs b/src/components/script/dom/htmlembedelement.rs index 5bc729595ea..3f958e6e838 100644 --- a/src/components/script/dom/htmlembedelement.rs +++ b/src/components/script/dom/htmlembedelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index bb6aecc13a0..cab1b818015 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -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) } diff --git a/src/components/script/dom/htmlfontelement.rs b/src/components/script/dom/htmlfontelement.rs index 84a1d9d5f4a..c34a7f66141 100644 --- a/src/components/script/dom/htmlfontelement.rs +++ b/src/components/script/dom/htmlfontelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index 305abb204f8..6a419d24ced 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlframeelement.rs b/src/components/script/dom/htmlframeelement.rs index deef5711c74..df60c7f8fca 100644 --- a/src/components/script/dom/htmlframeelement.rs +++ b/src/components/script/dom/htmlframeelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlframesetelement.rs b/src/components/script/dom/htmlframesetelement.rs index 47151c95ba9..beb7021ffb6 100644 --- a/src/components/script/dom/htmlframesetelement.rs +++ b/src/components/script/dom/htmlframesetelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlheadelement.rs b/src/components/script/dom/htmlheadelement.rs index 3263131fe9a..d8d303a0483 100644 --- a/src/components/script/dom/htmlheadelement.rs +++ b/src/components/script/dom/htmlheadelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlheadingelement.rs b/src/components/script/dom/htmlheadingelement.rs index a199421863f..0d7f607f46a 100644 --- a/src/components/script/dom/htmlheadingelement.rs +++ b/src/components/script/dom/htmlheadingelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlhrelement.rs b/src/components/script/dom/htmlhrelement.rs index 15bf08b0eee..98829339845 100644 --- a/src/components/script/dom/htmlhrelement.rs +++ b/src/components/script/dom/htmlhrelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlhtmlelement.rs b/src/components/script/dom/htmlhtmlelement.rs index 0b06135432b..29c4fc3176e 100644 --- a/src/components/script/dom/htmlhtmlelement.rs +++ b/src/components/script/dom/htmlhtmlelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 766d7a711f9..47d01567b77 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index fa0dc117abd..35a38aa3057 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index 737be52132b..1b3cdec49d6 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmllabelelement.rs b/src/components/script/dom/htmllabelelement.rs index 433fff43c19..2896e65da59 100644 --- a/src/components/script/dom/htmllabelelement.rs +++ b/src/components/script/dom/htmllabelelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmllegendelement.rs b/src/components/script/dom/htmllegendelement.rs index b5552d5b277..e2e7d49f905 100644 --- a/src/components/script/dom/htmllegendelement.rs +++ b/src/components/script/dom/htmllegendelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmllielement.rs b/src/components/script/dom/htmllielement.rs index 37895089ae9..0f8aabbfa10 100644 --- a/src/components/script/dom/htmllielement.rs +++ b/src/components/script/dom/htmllielement.rs @@ -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) } } diff --git a/src/components/script/dom/htmllinkelement.rs b/src/components/script/dom/htmllinkelement.rs index eca69601efe..1ce030acb0a 100644 --- a/src/components/script/dom/htmllinkelement.rs +++ b/src/components/script/dom/htmllinkelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlmainelement.rs b/src/components/script/dom/htmlmainelement.rs index aa05a4f45f1..999f020bbd3 100644 --- a/src/components/script/dom/htmlmainelement.rs +++ b/src/components/script/dom/htmlmainelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index b61414f7363..b489647908e 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlmetaelement.rs b/src/components/script/dom/htmlmetaelement.rs index 07e60f74bae..fae9bf84a5a 100644 --- a/src/components/script/dom/htmlmetaelement.rs +++ b/src/components/script/dom/htmlmetaelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlmeterelement.rs b/src/components/script/dom/htmlmeterelement.rs index bd2d45ac269..422bd79028e 100644 --- a/src/components/script/dom/htmlmeterelement.rs +++ b/src/components/script/dom/htmlmeterelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlmodelement.rs b/src/components/script/dom/htmlmodelement.rs index e3ec4937b96..3323ed3a72b 100644 --- a/src/components/script/dom/htmlmodelement.rs +++ b/src/components/script/dom/htmlmodelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs index 4cb8b8868d9..407acd3e336 100644 --- a/src/components/script/dom/htmlobjectelement.rs +++ b/src/components/script/dom/htmlobjectelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlolistelement.rs b/src/components/script/dom/htmlolistelement.rs index 4655c0e636e..a72ea0c7c84 100644 --- a/src/components/script/dom/htmlolistelement.rs +++ b/src/components/script/dom/htmlolistelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs index c5480bfe8a0..d6773ad5ad7 100644 --- a/src/components/script/dom/htmloptgroupelement.rs +++ b/src/components/script/dom/htmloptgroupelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmloptionelement.rs b/src/components/script/dom/htmloptionelement.rs index 6a2ad322795..c366e2251f5 100644 --- a/src/components/script/dom/htmloptionelement.rs +++ b/src/components/script/dom/htmloptionelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmloutputelement.rs b/src/components/script/dom/htmloutputelement.rs index 53fecd54ed9..6d7cd2f5f52 100644 --- a/src/components/script/dom/htmloutputelement.rs +++ b/src/components/script/dom/htmloutputelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlparagraphelement.rs b/src/components/script/dom/htmlparagraphelement.rs index c434f9b6fe9..f013e888bc1 100644 --- a/src/components/script/dom/htmlparagraphelement.rs +++ b/src/components/script/dom/htmlparagraphelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlparamelement.rs b/src/components/script/dom/htmlparamelement.rs index dc9c759289d..5cb09b47d32 100644 --- a/src/components/script/dom/htmlparamelement.rs +++ b/src/components/script/dom/htmlparamelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlpreelement.rs b/src/components/script/dom/htmlpreelement.rs index dba067927eb..8a10a5f51ab 100644 --- a/src/components/script/dom/htmlpreelement.rs +++ b/src/components/script/dom/htmlpreelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlprogresselement.rs b/src/components/script/dom/htmlprogresselement.rs index 5f709ea11db..1f89c6b3c2f 100644 --- a/src/components/script/dom/htmlprogresselement.rs +++ b/src/components/script/dom/htmlprogresselement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlquoteelement.rs b/src/components/script/dom/htmlquoteelement.rs index d029f35c0ef..cc61f5cdaf0 100644 --- a/src/components/script/dom/htmlquoteelement.rs +++ b/src/components/script/dom/htmlquoteelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs index 6bff184a589..ab6d5077763 100644 --- a/src/components/script/dom/htmlscriptelement.rs +++ b/src/components/script/dom/htmlscriptelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlselectelement.rs b/src/components/script/dom/htmlselectelement.rs index bb6695ebbf9..dc497c8fc99 100644 --- a/src/components/script/dom/htmlselectelement.rs +++ b/src/components/script/dom/htmlselectelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs index 0077cdf5164..2021762f96d 100644 --- a/src/components/script/dom/htmlserializer.rs +++ b/src/components/script/dom/htmlserializer.rs @@ -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 { diff --git a/src/components/script/dom/htmlsourceelement.rs b/src/components/script/dom/htmlsourceelement.rs index e8b344328f8..145cff35956 100644 --- a/src/components/script/dom/htmlsourceelement.rs +++ b/src/components/script/dom/htmlsourceelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlspanelement.rs b/src/components/script/dom/htmlspanelement.rs index baedd650729..be99efe0c50 100644 --- a/src/components/script/dom/htmlspanelement.rs +++ b/src/components/script/dom/htmlspanelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlstyleelement.rs b/src/components/script/dom/htmlstyleelement.rs index cd325b93047..5fe70082399 100644 --- a/src/components/script/dom/htmlstyleelement.rs +++ b/src/components/script/dom/htmlstyleelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltablecaptionelement.rs b/src/components/script/dom/htmltablecaptionelement.rs index 60d95267b0f..01bdbff9255 100644 --- a/src/components/script/dom/htmltablecaptionelement.rs +++ b/src/components/script/dom/htmltablecaptionelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltablecolelement.rs b/src/components/script/dom/htmltablecolelement.rs index b060a1956e2..4d9e12956a2 100644 --- a/src/components/script/dom/htmltablecolelement.rs +++ b/src/components/script/dom/htmltablecolelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltabledatacellelement.rs b/src/components/script/dom/htmltabledatacellelement.rs index e01ebd2ef0b..3360c21b400 100644 --- a/src/components/script/dom/htmltabledatacellelement.rs +++ b/src/components/script/dom/htmltabledatacellelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltableelement.rs b/src/components/script/dom/htmltableelement.rs index a99a83fa39a..d675ddcad04 100644 --- a/src/components/script/dom/htmltableelement.rs +++ b/src/components/script/dom/htmltableelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltableheadercellelement.rs b/src/components/script/dom/htmltableheadercellelement.rs index f8a50353ae7..f145b0690c2 100644 --- a/src/components/script/dom/htmltableheadercellelement.rs +++ b/src/components/script/dom/htmltableheadercellelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltablerowelement.rs b/src/components/script/dom/htmltablerowelement.rs index 0c5191fbf7e..947e134f6ee 100644 --- a/src/components/script/dom/htmltablerowelement.rs +++ b/src/components/script/dom/htmltablerowelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltablesectionelement.rs b/src/components/script/dom/htmltablesectionelement.rs index d5d33b29dfc..972c51ce879 100644 --- a/src/components/script/dom/htmltablesectionelement.rs +++ b/src/components/script/dom/htmltablesectionelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltemplateelement.rs b/src/components/script/dom/htmltemplateelement.rs index fc80ec01d31..c06744c0302 100644 --- a/src/components/script/dom/htmltemplateelement.rs +++ b/src/components/script/dom/htmltemplateelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltextareaelement.rs b/src/components/script/dom/htmltextareaelement.rs index be10b719bba..aac13f366c6 100644 --- a/src/components/script/dom/htmltextareaelement.rs +++ b/src/components/script/dom/htmltextareaelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltimeelement.rs b/src/components/script/dom/htmltimeelement.rs index 104d2696721..5fc7fea8581 100644 --- a/src/components/script/dom/htmltimeelement.rs +++ b/src/components/script/dom/htmltimeelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltitleelement.rs b/src/components/script/dom/htmltitleelement.rs index d1013adbe37..d4b3a2b6b4f 100644 --- a/src/components/script/dom/htmltitleelement.rs +++ b/src/components/script/dom/htmltitleelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmltrackelement.rs b/src/components/script/dom/htmltrackelement.rs index a874c5b6339..d9ae83e16cc 100644 --- a/src/components/script/dom/htmltrackelement.rs +++ b/src/components/script/dom/htmltrackelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlulistelement.rs b/src/components/script/dom/htmlulistelement.rs index 932ff26e9e9..fdd2e512d30 100644 --- a/src/components/script/dom/htmlulistelement.rs +++ b/src/components/script/dom/htmlulistelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlunknownelement.rs b/src/components/script/dom/htmlunknownelement.rs index a84d21ef3ac..cfaca7464c7 100644 --- a/src/components/script/dom/htmlunknownelement.rs +++ b/src/components/script/dom/htmlunknownelement.rs @@ -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) } } diff --git a/src/components/script/dom/htmlvideoelement.rs b/src/components/script/dom/htmlvideoelement.rs index a172346d77c..0c4c291f31c 100644 --- a/src/components/script/dom/htmlvideoelement.rs +++ b/src/components/script/dom/htmlvideoelement.rs @@ -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) } } diff --git a/src/components/script/dom/location.rs b/src/components/script/dom/location.rs index c1d8d439bb8..2e346effb12 100644 --- a/src/components/script/dom/location.rs +++ b/src/components/script/dom/location.rs @@ -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) } diff --git a/src/components/script/dom/mouseevent.rs b/src/components/script/dom/mouseevent.rs index 32c7704b291..994a18d7be6 100644 --- a/src/components/script/dom/mouseevent.rs +++ b/src/components/script/dom/mouseevent.rs @@ -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) } diff --git a/src/components/script/dom/navigator.rs b/src/components/script/dom/navigator.rs index c0157adc704..a50967a25c1 100644 --- a/src/components/script/dom/navigator.rs +++ b/src/components/script/dom/navigator.rs @@ -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) } diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index e8be5f449aa..a05dc1e0171 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -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 diff --git a/src/components/script/dom/nodelist.rs b/src/components/script/dom/nodelist.rs index dc050b995ea..d5b98917a3d 100644 --- a/src/components/script/dom/nodelist.rs +++ b/src/components/script/dom/nodelist.rs @@ -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) } diff --git a/src/components/script/dom/performance.rs b/src/components/script/dom/performance.rs index 3665c7944de..13910eb701d 100644 --- a/src/components/script/dom/performance.rs +++ b/src/components/script/dom/performance.rs @@ -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) } } diff --git a/src/components/script/dom/performancetiming.rs b/src/components/script/dom/performancetiming.rs index 7065c5f33b6..c1deda98504 100644 --- a/src/components/script/dom/performancetiming.rs +++ b/src/components/script/dom/performancetiming.rs @@ -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) } } diff --git a/src/components/script/dom/processinginstruction.rs b/src/components/script/dom/processinginstruction.rs index 7138735db37..92e29b73617 100644 --- a/src/components/script/dom/processinginstruction.rs +++ b/src/components/script/dom/processinginstruction.rs @@ -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) } } diff --git a/src/components/script/dom/progressevent.rs b/src/components/script/dom/progressevent.rs index 7f66debae3c..4faf1a75a6e 100644 --- a/src/components/script/dom/progressevent.rs +++ b/src/components/script/dom/progressevent.rs @@ -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(); { diff --git a/src/components/script/dom/testbinding.rs b/src/components/script/dom/testbinding.rs index ce87bceccb8..6bc22be81c1 100644 --- a/src/components/script/dom/testbinding.rs +++ b/src/components/script/dom/testbinding.rs @@ -3,10 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::js::{JS, JSRef, Temporary}; -use dom::bindings::codegen::BindingDeclarations::TestBindingBinding; +use dom::bindings::codegen::BindingDeclarations::TestBindingBinding::TestEnum; +use dom::bindings::codegen::BindingDeclarations::TestBindingBinding::TestEnumValues::_empty; use dom::bindings::codegen::UnionTypes::{HTMLElementOrLong, StringOrFormData}; -use self::TestBindingBinding::TestEnum; -use self::TestBindingBinding::TestEnumValues::_empty; use dom::bindings::str::ByteString; use dom::bindings::utils::{Reflector, Reflectable}; use dom::blob::Blob; diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs index e8653fe22b0..e0f5edd2287 100644 --- a/src/components/script/dom/text.rs +++ b/src/components/script/dom/text.rs @@ -34,7 +34,7 @@ impl Text { pub fn new(text: DOMString, document: &JSRef<Document>) -> Temporary<Text> { let node = Text::new_inherited(text, document); - Node::reflect_node(~node, document, TextBinding::Wrap) + Node::reflect_node(box node, document, TextBinding::Wrap) } pub fn Constructor(owner: &JSRef<Window>, text: DOMString) -> Fallible<Temporary<Text>> { diff --git a/src/components/script/dom/uievent.rs b/src/components/script/dom/uievent.rs index d37ef605512..c0e852d2971 100644 --- a/src/components/script/dom/uievent.rs +++ b/src/components/script/dom/uievent.rs @@ -37,7 +37,7 @@ impl UIEvent { } pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<UIEvent> { - reflect_dom_object(~UIEvent::new_inherited(UIEventTypeId), + reflect_dom_object(box UIEvent::new_inherited(UIEventTypeId), window, UIEventBinding::Wrap) } diff --git a/src/components/script/dom/validitystate.rs b/src/components/script/dom/validitystate.rs index 15c654fc814..ffb7ca95864 100644 --- a/src/components/script/dom/validitystate.rs +++ b/src/components/script/dom/validitystate.rs @@ -24,7 +24,7 @@ impl ValidityState { } pub fn new(window: &JSRef<Window>) -> Temporary<ValidityState> { - reflect_dom_object(~ValidityState::new_inherited(window), + reflect_dom_object(box ValidityState::new_inherited(window), window, ValidityStateBinding::Wrap) } diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 0e553ac54fa..e620714a9c4 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -70,9 +70,9 @@ pub struct Window { pub location: Option<JS<Location>>, pub navigator: Option<JS<Navigator>>, pub image_cache_task: ImageCacheTask, - pub active_timers: HashMap<TimerId, TimerHandle>, + pub active_timers: Box<HashMap<TimerId, TimerHandle>>, pub next_timer_handle: i32, - pub compositor: Untraceable<~ScriptListener>, + pub compositor: Untraceable<Box<ScriptListener>>, pub browser_context: Option<BrowserContext>, pub page: Rc<Page>, pub performance: Option<JS<Performance>>, @@ -382,10 +382,10 @@ impl Window { pub fn new(cx: *JSContext, page: Rc<Page>, script_chan: ScriptChan, - compositor: ~ScriptListener, + compositor: Box<ScriptListener>, image_cache_task: ImageCacheTask) -> JS<Window> { - let win = ~Window { + let win = box Window { eventtarget: EventTarget::new_inherited(WindowTypeId), script_chan: script_chan, console: None, @@ -394,7 +394,7 @@ impl Window { location: None, navigator: None, image_cache_task: image_cache_task, - active_timers: HashMap::new(), + active_timers: box HashMap::new(), next_timer_handle: 0, browser_context: None, performance: None, diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs index 31e6d037563..3161d4d6ed6 100644 --- a/src/components/script/dom/xmlhttprequest.rs +++ b/src/components/script/dom/xmlhttprequest.rs @@ -4,8 +4,8 @@ use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestBinding; use dom::bindings::str::ByteString; -use self::XMLHttpRequestBinding::XMLHttpRequestResponseType; -use self::XMLHttpRequestBinding::XMLHttpRequestResponseTypeValues::{_empty, Text}; +use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestBinding::XMLHttpRequestResponseType; +use dom::bindings::codegen::BindingDeclarations::XMLHttpRequestBinding::XMLHttpRequestResponseTypeValues::{_empty, Text}; use dom::bindings::codegen::InheritTypes::{EventTargetCast, XMLHttpRequestDerived}; use dom::bindings::error::{ErrorResult, InvalidState, Network, Syntax, Security}; use dom::document::Document; @@ -33,7 +33,7 @@ use libc::c_void; use std::comm::channel; use std::io::MemWriter; -use std::task; +use std::task::TaskBuilder; use ResponseHeaderCollection = http::headers::response::HeaderCollection; use RequestHeaderCollection = http::headers::request::HeaderCollection; @@ -148,7 +148,7 @@ impl XMLHttpRequest { xhr } pub fn new(window: &JSRef<Window>) -> Temporary<XMLHttpRequest> { - reflect_dom_object(~XMLHttpRequest::new_inherited(window), + reflect_dom_object(box XMLHttpRequest::new_inherited(window), window, XMLHttpRequestBinding::Wrap) } @@ -328,7 +328,7 @@ impl<'a> XMLHttpRequestMethods<'a> for JSRef<'a, XMLHttpRequest> { if self.sync { return XMLHttpRequest::fetch(&mut Sync(self), resource_task, url); } else { - let builder = task::task().named("XHRTask"); + let builder = TaskBuilder::new().named("XHRTask"); unsafe { let addr = self.to_trusted(); let script_chan = global.script_chan.clone(); @@ -493,4 +493,4 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> { } } } -}
\ No newline at end of file +} diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs index bd8dd38c806..8312e56bb78 100644 --- a/src/components/script/dom/xmlhttprequestupload.rs +++ b/src/components/script/dom/xmlhttprequestupload.rs @@ -23,7 +23,7 @@ impl XMLHttpRequestUpload { } } pub fn new(window: &JSRef<Window>) -> Temporary<XMLHttpRequestUpload> { - reflect_dom_object(~XMLHttpRequestUpload::new_inherited(), + reflect_dom_object(box XMLHttpRequestUpload::new_inherited(), window, XMLHttpRequestUploadBinding::Wrap) } |