diff options
author | Cameron Zwarich <zwarich@mozilla.com> | 2014-09-19 01:32:30 -0700 |
---|---|---|
committer | Cameron Zwarich <zwarich@mozilla.com> | 2014-09-20 11:54:10 -0700 |
commit | 2c8d51a37c84fb5de531d00c45de9c0020930b11 (patch) | |
tree | 9d65c2f2141edf9bd8b47bb785b7e948e092f831 | |
parent | 2adc594e5d8babaadbe1a4e05a8f7d808313728f (diff) | |
download | servo-2c8d51a37c84fb5de531d00c45de9c0020930b11.tar.gz servo-2c8d51a37c84fb5de531d00c45de9c0020930b11.zip |
More progress in the &JSRef -> JSRef conversion
Change all of the <Class>Methods traits to take `self` instead of
`&self`.
66 files changed, 812 insertions, 815 deletions
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 00d42d22b49..bf6880d1026 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -116,33 +116,32 @@ impl Attr { } impl<'a> AttrMethods for JSRef<'a, Attr> { - fn LocalName(&self) -> DOMString { + fn LocalName(self) -> DOMString { self.local_name().as_slice().to_string() } - fn Value(&self) -> DOMString { + fn Value(self) -> DOMString { self.value().as_slice().to_string() } - fn SetValue(&self, value: DOMString) { + fn SetValue(self, value: DOMString) { let owner = self.owner.root(); - let value = owner.deref().parse_attribute( - &self.namespace, self.local_name(), value); + let value = owner.deref().parse_attribute(&self.namespace, self.local_name(), value); self.set_value(ReplacedAttr, value); } - fn Name(&self) -> DOMString { + fn Name(self) -> DOMString { self.name.as_slice().to_string() } - fn GetNamespaceURI(&self) -> Option<DOMString> { + fn GetNamespaceURI(self) -> Option<DOMString> { match self.namespace.to_str() { "" => None, url => Some(url.to_string()), } } - fn GetPrefix(&self) -> Option<DOMString> { + fn GetPrefix(self) -> Option<DOMString> { self.prefix.clone() } } diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index dd39ff61563..8ec5f24ccdd 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -2186,7 +2186,7 @@ class CGCallGenerator(CGThing): if static: call = CGWrapper(call, pre="%s::" % descriptorProvider.interface.identifier.name) else: - call = CGWrapper(call, pre="(*%s)." % object) + call = CGWrapper(call, pre="%s." % object) call = CGList([call, CGWrapper(args, pre="(", post=")")]) self.cgRoot.append(CGList([ @@ -4064,7 +4064,7 @@ class CGInterfaceTrait(CGThing): return "".join(", %s: %s" % argument for argument in arguments) methods = CGList([ - CGGeneric("fn %s(&self%s) -> %s;\n" % (name, fmt(arguments), rettype)) + CGGeneric("fn %s(self%s) -> %s;\n" % (name, fmt(arguments), rettype)) for name, arguments, rettype in members() ], "") self.cgRoot = CGWrapper(CGIndenter(methods), diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index c96b63eae7c..84553ee2a93 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -46,21 +46,21 @@ impl CanvasRenderingContext2D { } impl<'a> CanvasRenderingContext2DMethods for JSRef<'a, CanvasRenderingContext2D> { - fn Canvas(&self) -> Temporary<HTMLCanvasElement> { + fn Canvas(self) -> Temporary<HTMLCanvasElement> { Temporary::new(self.canvas) } - fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { + fn FillRect(self, x: f64, y: f64, width: f64, height: f64) { let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32)); self.renderer.deref().send(FillRect(rect)); } - fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { + fn ClearRect(self, x: f64, y: f64, width: f64, height: f64) { let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32)); self.renderer.deref().send(ClearRect(rect)); } - fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { + fn StrokeRect(self, x: f64, y: f64, width: f64, height: f64) { let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32)); self.renderer.deref().send(StrokeRect(rect)); } diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index a7ac4a2d631..14c1123f1bd 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -45,37 +45,37 @@ impl CharacterData { } impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> { - fn Data(&self) -> DOMString { + fn Data(self) -> DOMString { self.data.deref().borrow().clone() } - fn SetData(&self, arg: DOMString) -> ErrorResult { + fn SetData(self, arg: DOMString) -> ErrorResult { *self.data.deref().borrow_mut() = arg; Ok(()) } - fn Length(&self) -> u32 { + fn Length(self) -> u32 { self.data.deref().borrow().len() as u32 } - fn SubstringData(&self, offset: u32, count: u32) -> Fallible<DOMString> { + fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> { Ok(self.data.deref().borrow().as_slice().slice(offset as uint, count as uint).to_string()) } - fn AppendData(&self, arg: DOMString) -> ErrorResult { + fn AppendData(self, arg: DOMString) -> ErrorResult { self.data.deref().borrow_mut().push_str(arg.as_slice()); Ok(()) } - fn InsertData(&self, offset: u32, arg: DOMString) -> ErrorResult { + fn InsertData(self, offset: u32, arg: DOMString) -> ErrorResult { self.ReplaceData(offset, 0, arg) } - fn DeleteData(&self, offset: u32, count: u32) -> ErrorResult { + fn DeleteData(self, offset: u32, count: u32) -> ErrorResult { self.ReplaceData(offset, count, "".to_string()) } - fn ReplaceData(&self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { + fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { let length = self.data.deref().borrow().len() as u32; if offset > length { return Err(IndexSize); @@ -94,8 +94,8 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> { } // http://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(&self) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Remove(self) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.remove_self(); } } diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index d761252eaef..d8757b3eb81 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -28,27 +28,27 @@ impl Console { } impl<'a> ConsoleMethods for JSRef<'a, Console> { - fn Log(&self, message: DOMString) { + fn Log(self, message: DOMString) { println!("{:s}", message); } - fn Debug(&self, message: DOMString) { + fn Debug(self, message: DOMString) { println!("{:s}", message); } - fn Info(&self, message: DOMString) { + fn Info(self, message: DOMString) { println!("{:s}", message); } - fn Warn(&self, message: DOMString) { + fn Warn(self, message: DOMString) { println!("{:s}", message); } - fn Error(&self, message: DOMString) { + fn Error(self, message: DOMString) { println!("{:s}", message); } - fn Assert(&self, condition: bool, message: Option<DOMString>) { + fn Assert(self, condition: bool, message: Option<DOMString>) { if !condition { let message = match message { Some(ref message) => message.as_slice(), diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index 71dfb9c89f5..7549176d2ee 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -57,18 +57,18 @@ impl CustomEvent { } impl<'a> CustomEventMethods for JSRef<'a, CustomEvent> { - fn Detail(&self, _cx: *mut JSContext) -> JSVal { + fn Detail(self, _cx: *mut JSContext) -> JSVal { *self.detail.deref().get() } - fn InitCustomEvent(&self, + fn InitCustomEvent(self, _cx: *mut JSContext, type_: DOMString, can_bubble: bool, cancelable: bool, detail: JSVal) { self.detail.deref().set(Traceable::new(detail)); - let event: JSRef<Event> = EventCast::from_ref(*self); + let event: JSRef<Event> = EventCast::from_ref(self); event.InitEvent(type_, can_bubble, cancelable); } } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index a17cd511990..f707f6f8d55 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -151,7 +151,7 @@ impl DedicatedWorkerGlobalScope { } impl<'a> DedicatedWorkerGlobalScopeMethods for JSRef<'a, DedicatedWorkerGlobalScope> { - fn PostMessage(&self, cx: *mut JSContext, message: JSVal) { + fn PostMessage(self, cx: *mut JSContext, message: JSVal) { let mut data = ptr::mut_null(); let mut nbytes = 0; unsafe { @@ -163,13 +163,13 @@ impl<'a> DedicatedWorkerGlobalScopeMethods for JSRef<'a, DedicatedWorkerGlobalSc sender.send(WorkerPostMessage(*self.worker, data, nbytes)); } - fn GetOnmessage(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnmessage(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("message") } - fn SetOnmessage(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnmessage(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("message", listener) } } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 69f1dd25d3e..e9f16bc60e2 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -367,25 +367,25 @@ impl<'a> PrivateDocumentHelpers for JSRef<'a, Document> { impl<'a> DocumentMethods for JSRef<'a, Document> { // http://dom.spec.whatwg.org/#dom-document-implementation - fn Implementation(&self) -> Temporary<DOMImplementation> { + fn Implementation(self) -> Temporary<DOMImplementation> { if self.implementation.get().is_none() { - self.implementation.assign(Some(DOMImplementation::new(*self))); + self.implementation.assign(Some(DOMImplementation::new(self))); } Temporary::new(self.implementation.get().get_ref().clone()) } // http://dom.spec.whatwg.org/#dom-document-url - fn URL(&self) -> DOMString { + fn URL(self) -> DOMString { self.url().serialize() } // http://dom.spec.whatwg.org/#dom-document-documenturi - fn DocumentURI(&self) -> DOMString { + fn DocumentURI(self) -> DOMString { self.URL() } // http://dom.spec.whatwg.org/#dom-document-compatmode - fn CompatMode(&self) -> DOMString { + fn CompatMode(self) -> DOMString { match self.quirks_mode.deref().get() { LimitedQuirks | NoQuirks => "CSS1Compat".to_string(), FullQuirks => "BackCompat".to_string() @@ -393,18 +393,18 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://dom.spec.whatwg.org/#dom-document-characterset - fn CharacterSet(&self) -> DOMString { + fn CharacterSet(self) -> DOMString { self.encoding_name.deref().borrow().as_slice().to_ascii_lower() } // http://dom.spec.whatwg.org/#dom-document-content_type - fn ContentType(&self) -> DOMString { + fn ContentType(self) -> DOMString { self.content_type.clone() } // http://dom.spec.whatwg.org/#dom-document-doctype - fn GetDoctype(&self) -> Option<Temporary<DocumentType>> { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn GetDoctype(self) -> Option<Temporary<DocumentType>> { + let node: JSRef<Node> = NodeCast::from_ref(self); node.children().find(|child| { child.is_doctype() }).map(|node| { @@ -414,32 +414,32 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://dom.spec.whatwg.org/#dom-document-documentelement - fn GetDocumentElement(&self) -> Option<Temporary<Element>> { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn GetDocumentElement(self) -> Option<Temporary<Element>> { + let node: JSRef<Node> = NodeCast::from_ref(self); node.child_elements().next().map(|elem| Temporary::from_rooted(elem)) } // http://dom.spec.whatwg.org/#dom-document-getelementsbytagname - fn GetElementsByTagName(&self, tag_name: DOMString) -> Temporary<HTMLCollection> { + fn GetElementsByTagName(self, tag_name: DOMString) -> Temporary<HTMLCollection> { let window = self.window.root(); - HTMLCollection::by_tag_name(*window, NodeCast::from_ref(*self), tag_name) + HTMLCollection::by_tag_name(*window, NodeCast::from_ref(self), tag_name) } // http://dom.spec.whatwg.org/#dom-document-getelementsbytagnamens - fn GetElementsByTagNameNS(&self, maybe_ns: Option<DOMString>, tag_name: DOMString) -> Temporary<HTMLCollection> { + fn GetElementsByTagNameNS(self, maybe_ns: Option<DOMString>, tag_name: DOMString) -> Temporary<HTMLCollection> { let window = self.window.root(); - HTMLCollection::by_tag_name_ns(*window, NodeCast::from_ref(*self), tag_name, maybe_ns) + HTMLCollection::by_tag_name_ns(*window, NodeCast::from_ref(self), tag_name, maybe_ns) } // http://dom.spec.whatwg.org/#dom-document-getelementsbyclassname - fn GetElementsByClassName(&self, classes: DOMString) -> Temporary<HTMLCollection> { + fn GetElementsByClassName(self, classes: DOMString) -> Temporary<HTMLCollection> { let window = self.window.root(); - HTMLCollection::by_class_name(*window, NodeCast::from_ref(*self), classes) + HTMLCollection::by_class_name(*window, NodeCast::from_ref(self), classes) } // http://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid - fn GetElementById(&self, id: DOMString) -> Option<Temporary<Element>> { + fn GetElementById(self, id: DOMString) -> Option<Temporary<Element>> { match self.idmap.deref().borrow().find_equiv(&id) { None => None, Some(ref elements) => Some(Temporary::new((*elements)[0].clone())), @@ -447,17 +447,17 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://dom.spec.whatwg.org/#dom-document-createelement - fn CreateElement(&self, local_name: DOMString) -> Fallible<Temporary<Element>> { + fn CreateElement(self, local_name: DOMString) -> Fallible<Temporary<Element>> { if xml_name_type(local_name.as_slice()) == InvalidXMLName { debug!("Not a valid element name"); return Err(InvalidCharacter); } let local_name = local_name.as_slice().to_ascii_lower(); - Ok(build_element_from_tag(local_name, namespace::HTML, *self)) + Ok(build_element_from_tag(local_name, namespace::HTML, self)) } // http://dom.spec.whatwg.org/#dom-document-createelementns - fn CreateElementNS(&self, + fn CreateElementNS(self, namespace: Option<DOMString>, qualified_name: DOMString) -> Fallible<Temporary<Element>> { let ns = Namespace::from_str(null_str_as_empty_ref(&namespace)); @@ -497,31 +497,31 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } if ns == namespace::HTML { - Ok(build_element_from_tag(local_name_from_qname.to_string(), ns, *self)) + Ok(build_element_from_tag(local_name_from_qname.to_string(), ns, self)) } else { Ok(Element::new(local_name_from_qname.to_string(), ns, - prefix_from_qname.map(|s| s.to_string()), *self)) + prefix_from_qname.map(|s| s.to_string()), self)) } } // http://dom.spec.whatwg.org/#dom-document-createdocumentfragment - fn CreateDocumentFragment(&self) -> Temporary<DocumentFragment> { - DocumentFragment::new(*self) + fn CreateDocumentFragment(self) -> Temporary<DocumentFragment> { + DocumentFragment::new(self) } // http://dom.spec.whatwg.org/#dom-document-createtextnode - fn CreateTextNode(&self, data: DOMString) + fn CreateTextNode(self, data: DOMString) -> Temporary<Text> { - Text::new(data, *self) + Text::new(data, self) } // http://dom.spec.whatwg.org/#dom-document-createcomment - fn CreateComment(&self, data: DOMString) -> Temporary<Comment> { - Comment::new(data, *self) + fn CreateComment(self, data: DOMString) -> Temporary<Comment> { + Comment::new(data, self) } // http://dom.spec.whatwg.org/#dom-document-createprocessinginstruction - fn CreateProcessingInstruction(&self, target: DOMString, + fn CreateProcessingInstruction(self, target: DOMString, data: DOMString) -> Fallible<Temporary<ProcessingInstruction>> { // Step 1. if xml_name_type(target.as_slice()) == InvalidXMLName { @@ -534,11 +534,11 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // Step 3. - Ok(ProcessingInstruction::new(target, data, *self)) + Ok(ProcessingInstruction::new(target, data, self)) } // http://dom.spec.whatwg.org/#dom-document-importnode - fn ImportNode(&self, node: JSRef<Node>, deep: bool) -> Fallible<Temporary<Node>> { + fn ImportNode(self, node: JSRef<Node>, deep: bool) -> Fallible<Temporary<Node>> { // Step 1. if node.is_document() { return Err(NotSupported); @@ -550,25 +550,25 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { false => DoNotCloneChildren }; - Ok(Node::clone(node, Some(*self), clone_children)) + Ok(Node::clone(node, Some(self), clone_children)) } // http://dom.spec.whatwg.org/#dom-document-adoptnode - fn AdoptNode(&self, node: JSRef<Node>) -> Fallible<Temporary<Node>> { + fn AdoptNode(self, node: JSRef<Node>) -> Fallible<Temporary<Node>> { // Step 1. if node.is_document() { return Err(NotSupported); } // Step 2. - Node::adopt(node, *self); + Node::adopt(node, self); // Step 3. Ok(Temporary::from_rooted(node)) } // http://dom.spec.whatwg.org/#dom-document-createevent - fn CreateEvent(&self, interface: DOMString) -> Fallible<Temporary<Event>> { + fn CreateEvent(self, interface: DOMString) -> Fallible<Temporary<Event>> { let window = self.window.root(); match interface.as_slice().to_ascii_lower().as_slice() { @@ -581,7 +581,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/html/#dom-document-lastmodified - fn LastModified(&self) -> DOMString { + fn LastModified(self) -> DOMString { match *self.last_modified.borrow() { Some(ref t) => t.clone(), None => time::now().strftime("%m/%d/%Y %H:%M:%S"), @@ -589,18 +589,18 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://dom.spec.whatwg.org/#dom-document-createrange - fn CreateRange(&self) -> Temporary<Range> { - Range::new(*self) + fn CreateRange(self) -> Temporary<Range> { + Range::new(self) } // http://dom.spec.whatwg.org/#dom-document-createtreewalker - fn CreateTreeWalker(&self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>) + fn CreateTreeWalker(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>) -> Temporary<TreeWalker> { - TreeWalker::new(*self, root, whatToShow, filter) + TreeWalker::new(self, root, whatToShow, filter) } // http://www.whatwg.org/specs/web-apps/current-work/#document.title - fn Title(&self) -> DOMString { + fn Title(self) -> DOMString { let mut title = String::new(); self.GetDocumentElement().root().map(|root| { let root: JSRef<Node> = NodeCast::from_ref(*root); @@ -620,7 +620,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/specs/web-apps/current-work/#document.title - fn SetTitle(&self, title: DOMString) -> ErrorResult { + fn SetTitle(self, title: DOMString) -> ErrorResult { self.GetDocumentElement().root().map(|root| { let root: JSRef<Node> = NodeCast::from_ref(*root); let head_node = root.traverse_preorder().find(|child| { @@ -642,7 +642,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } }, None => { - let new_title = HTMLTitleElement::new("title".to_string(), *self).root(); + let new_title = HTMLTitleElement::new("title".to_string(), self).root(); let new_title: JSRef<Node> = NodeCast::from_ref(*new_title); if !title.is_empty() { @@ -658,7 +658,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-head - fn GetHead(&self) -> Option<Temporary<HTMLHeadElement>> { + fn GetHead(self) -> Option<Temporary<HTMLHeadElement>> { self.get_html_element().and_then(|root| { let root = root.root(); let node: JSRef<Node> = NodeCast::from_ref(*root); @@ -671,7 +671,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-body - fn GetBody(&self) -> Option<Temporary<HTMLElement>> { + fn GetBody(self) -> Option<Temporary<HTMLElement>> { self.get_html_element().and_then(|root| { let root = root.root(); let node: JSRef<Node> = NodeCast::from_ref(*root); @@ -688,7 +688,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-body - fn SetBody(&self, new_body: Option<JSRef<HTMLElement>>) -> ErrorResult { + fn SetBody(self, new_body: Option<JSRef<HTMLElement>>) -> ErrorResult { // Step 1. match new_body { Some(ref htmlelem) => { @@ -731,7 +731,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { } // http://www.whatwg.org/specs/web-apps/current-work/#dom-document-getelementsbyname - fn GetElementsByName(&self, name: DOMString) -> Temporary<NodeList> { + fn GetElementsByName(self, name: DOMString) -> Temporary<NodeList> { self.createNodeList(|node| { if !node.is_element() { return false; @@ -744,121 +744,121 @@ impl<'a> DocumentMethods for JSRef<'a, Document> { }) } - fn Images(&self) -> Temporary<HTMLCollection> { + fn Images(self) -> Temporary<HTMLCollection> { if self.images.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box ImagesFilter; self.images.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.images.get().get_ref().clone()) } - fn Embeds(&self) -> Temporary<HTMLCollection> { + fn Embeds(self) -> Temporary<HTMLCollection> { if self.embeds.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box EmbedsFilter; self.embeds.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.embeds.get().get_ref().clone()) } - fn Plugins(&self) -> Temporary<HTMLCollection> { + fn Plugins(self) -> Temporary<HTMLCollection> { self.Embeds() } - fn Links(&self) -> Temporary<HTMLCollection> { + fn Links(self) -> Temporary<HTMLCollection> { if self.links.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box LinksFilter; self.links.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.links.get().get_ref().clone()) } - fn Forms(&self) -> Temporary<HTMLCollection> { + fn Forms(self) -> Temporary<HTMLCollection> { if self.forms.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box FormsFilter; self.forms.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.forms.get().get_ref().clone()) } - fn Scripts(&self) -> Temporary<HTMLCollection> { + fn Scripts(self) -> Temporary<HTMLCollection> { if self.scripts.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box ScriptsFilter; self.scripts.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.scripts.get().get_ref().clone()) } - fn Anchors(&self) -> Temporary<HTMLCollection> { + fn Anchors(self) -> Temporary<HTMLCollection> { if self.anchors.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box AnchorsFilter; self.anchors.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.anchors.get().get_ref().clone()) } - fn Applets(&self) -> Temporary<HTMLCollection> { + fn Applets(self) -> Temporary<HTMLCollection> { // FIXME: This should be return OBJECT elements containing applets. if self.applets.get().is_none() { let window = self.window.root(); - let root = NodeCast::from_ref(*self); + let root = NodeCast::from_ref(self); let filter = box AppletsFilter; self.applets.assign(Some(HTMLCollection::create(*window, root, filter))); } Temporary::new(self.applets.get().get_ref().clone()) } - fn Location(&self) -> Temporary<Location> { + fn Location(self) -> Temporary<Location> { let window = self.window.root(); window.Location() } // http://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(&self) -> Temporary<HTMLCollection> { + fn Children(self) -> Temporary<HTMLCollection> { let window = self.window.root(); - HTMLCollection::children(*window, NodeCast::from_ref(*self)) + HTMLCollection::children(*window, NodeCast::from_ref(self)) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector(selectors) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector_all(selectors) } - fn GetOnclick(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnclick(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("click") } - fn SetOnclick(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnclick(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("click", listener) } - fn GetOnload(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnload(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("load") } - fn SetOnload(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnload(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("load", listener) } } diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 916a3550264..3a2a04c299e 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -53,23 +53,22 @@ impl DocumentFragment { impl<'a> DocumentFragmentMethods for JSRef<'a, DocumentFragment> { // http://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(&self) -> Temporary<HTMLCollection> { - let window = window_from_node(*self).root(); - HTMLCollection::children(*window, NodeCast::from_ref(*self)) + fn Children(self) -> Temporary<HTMLCollection> { + let window = window_from_node(self).root(); + HTMLCollection::children(*window, NodeCast::from_ref(self)) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector(selectors) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector_all(selectors) } - } impl Reflectable for DocumentFragment { diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index 5c438b276ab..8bbf0185a48 100644 --- a/components/script/dom/documenttype.rs +++ b/components/script/dom/documenttype.rs @@ -56,21 +56,21 @@ impl DocumentType { } impl<'a> DocumentTypeMethods for JSRef<'a, DocumentType> { - fn Name(&self) -> DOMString { + fn Name(self) -> DOMString { self.name.clone() } - fn PublicId(&self) -> DOMString { + fn PublicId(self) -> DOMString { self.public_id.clone() } - fn SystemId(&self) -> DOMString { + fn SystemId(self) -> DOMString { self.system_id.clone() } // http://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(&self) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Remove(self) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.remove_self(); } } diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 633eaa452f0..ff2993baac8 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -91,7 +91,7 @@ impl Reflectable for DOMException { impl<'a> DOMExceptionMethods for JSRef<'a, DOMException> { // http://dom.spec.whatwg.org/#dom-domexception-code - fn Code(&self) -> u16 { + fn Code(self) -> u16 { match self.code { // http://dom.spec.whatwg.org/#concept-throw EncodingError => 0, @@ -100,12 +100,12 @@ impl<'a> DOMExceptionMethods for JSRef<'a, DOMException> { } // http://dom.spec.whatwg.org/#error-names-0 - fn Name(&self) -> DOMString { + fn Name(self) -> DOMString { self.code.to_string() } // http://dom.spec.whatwg.org/#error-names-0 - fn Message(&self) -> DOMString { + fn Message(self) -> DOMString { match self.code { IndexSizeError => "The index is not in the allowed range.".to_string(), HierarchyRequestError => "The operation would yield an incorrect node tree.".to_string(), diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 1c5c3cd55cf..5ce1706b78f 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -54,7 +54,7 @@ impl Reflectable for DOMImplementation { // http://dom.spec.whatwg.org/#domimplementation impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { // http://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype - fn CreateDocumentType(&self, qname: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<Temporary<DocumentType>> { + fn CreateDocumentType(self, qname: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<Temporary<DocumentType>> { match xml_name_type(qname.as_slice()) { // Step 1. InvalidXMLName => Err(InvalidCharacter), @@ -69,7 +69,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { } // http://dom.spec.whatwg.org/#dom-domimplementation-createdocument - fn CreateDocument(&self, namespace: Option<DOMString>, qname: DOMString, + fn CreateDocument(self, namespace: Option<DOMString>, qname: DOMString, maybe_doctype: Option<JSRef<DocumentType>>) -> Fallible<Temporary<Document>> { let doc = self.document.root(); let win = doc.window.root(); @@ -115,7 +115,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> { } // http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument - fn CreateHTMLDocument(&self, title: Option<DOMString>) -> Temporary<Document> { + fn CreateHTMLDocument(self, title: Option<DOMString>) -> Temporary<Document> { let document = self.document.root(); let win = document.window.root(); diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index a75e6e13444..a467fd1812d 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -39,7 +39,7 @@ impl DOMParser { } impl<'a> DOMParserMethods for JSRef<'a, DOMParser> { - fn ParseFromString(&self, + fn ParseFromString(self, _s: DOMString, ty: DOMParserBinding::SupportedType) -> Fallible<Temporary<Document>> { diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index f9fdf9b79cd..53ca08ba482 100644 --- a/components/script/dom/domrect.rs +++ b/components/script/dom/domrect.rs @@ -41,27 +41,27 @@ impl DOMRect { } impl<'a> DOMRectMethods for JSRef<'a, DOMRect> { - fn Top(&self) -> f32 { + fn Top(self) -> f32 { self.top } - fn Bottom(&self) -> f32 { + fn Bottom(self) -> f32 { self.bottom } - fn Left(&self) -> f32 { + fn Left(self) -> f32 { self.left } - fn Right(&self) -> f32 { + fn Right(self) -> f32 { self.right } - fn Width(&self) -> f32 { + fn Width(self) -> f32 { (self.right - self.left).abs() } - fn Height(&self) -> f32 { + fn Height(self) -> f32 { (self.bottom - self.top).abs() } } diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs index bf2d277d6bf..5520002afe3 100644 --- a/components/script/dom/domrectlist.rs +++ b/components/script/dom/domrectlist.rs @@ -37,11 +37,11 @@ impl DOMRectList { } impl<'a> DOMRectListMethods for JSRef<'a, DOMRectList> { - fn Length(&self) -> u32 { + fn Length(self) -> u32 { self.rects.len() as u32 } - fn Item(&self, index: u32) -> Option<Temporary<DOMRect>> { + fn Item(self, index: u32) -> Option<Temporary<DOMRect>> { let rects = &self.rects; if index < rects.len() as u32 { Some(Temporary::new(rects[index as uint].clone())) @@ -50,7 +50,7 @@ impl<'a> DOMRectListMethods for JSRef<'a, DOMRectList> { } } - fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Temporary<DOMRect>> { + fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Temporary<DOMRect>> { *found = index < self.rects.len() as u32; self.Item(index) } diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 18633658943..fc4fefb3ec0 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -71,27 +71,27 @@ impl<'a> PrivateDOMTokenListHelpers for JSRef<'a, DOMTokenList> { // http://dom.spec.whatwg.org/#domtokenlist impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> { // http://dom.spec.whatwg.org/#dom-domtokenlist-length - fn Length(&self) -> u32 { + fn Length(self) -> u32 { self.attribute().root().map(|attr| { attr.value().tokens().map(|tokens| tokens.len()).unwrap_or(0) }).unwrap_or(0) as u32 } // http://dom.spec.whatwg.org/#dom-domtokenlist-item - fn Item(&self, index: u32) -> Option<DOMString> { + fn Item(self, index: u32) -> Option<DOMString> { self.attribute().root().and_then(|attr| attr.value().tokens().and_then(|mut tokens| { tokens.idx(index as uint).map(|token| token.as_slice().to_string()) })) } - fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<DOMString> { + fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<DOMString> { let item = self.Item(index); *found = item.is_some(); item } // http://dom.spec.whatwg.org/#dom-domtokenlist-contains - fn Contains(&self, token: DOMString) -> Fallible<bool> { + fn Contains(self, token: DOMString) -> Fallible<bool> { self.check_token_exceptions(token.as_slice()).map(|slice| { self.attribute().root().and_then(|attr| attr.value().tokens().map(|mut tokens| { let atom = Atom::from_slice(slice); diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 143f025fc72..4101c7e074e 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -271,7 +271,7 @@ impl<'a> ElementHelpers for JSRef<'a, Element> { summarized } - fn is_void(&self) -> bool { + fn is_void(self) -> bool { if self.namespace != namespace::HTML { return false } @@ -506,24 +506,24 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> { impl<'a> ElementMethods for JSRef<'a, Element> { // http://dom.spec.whatwg.org/#dom-element-namespaceuri - fn GetNamespaceURI(&self) -> Option<DOMString> { + fn GetNamespaceURI(self) -> Option<DOMString> { match self.namespace { Null => None, ref ns => Some(ns.to_str().to_string()) } } - fn LocalName(&self) -> DOMString { + fn LocalName(self) -> DOMString { self.local_name.as_slice().to_string() } // http://dom.spec.whatwg.org/#dom-element-prefix - fn GetPrefix(&self) -> Option<DOMString> { + fn GetPrefix(self) -> Option<DOMString> { self.prefix.clone() } // http://dom.spec.whatwg.org/#dom-element-tagname - fn TagName(&self) -> DOMString { + fn TagName(self) -> DOMString { let qualified_name = match self.prefix { Some(ref prefix) => format!("{}:{}", prefix, self.local_name).into_maybe_owned(), None => self.local_name.as_slice().into_maybe_owned() @@ -536,31 +536,31 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-id - fn Id(&self) -> DOMString { + fn Id(self) -> DOMString { self.get_string_attribute("id") } // http://dom.spec.whatwg.org/#dom-element-id - fn SetId(&self, id: DOMString) { + fn SetId(self, id: DOMString) { self.set_atomic_attribute("id", id); } // http://dom.spec.whatwg.org/#dom-element-classname - fn ClassName(&self) -> DOMString { + fn ClassName(self) -> DOMString { self.get_string_attribute("class") } // http://dom.spec.whatwg.org/#dom-element-classname - fn SetClassName(&self, class: DOMString) { + fn SetClassName(self, class: DOMString) { self.set_tokenlist_attribute("class", class); } // http://dom.spec.whatwg.org/#dom-element-classlist - fn ClassList(&self) -> Temporary<DOMTokenList> { + fn ClassList(self) -> Temporary<DOMTokenList> { match self.class_list.get() { Some(class_list) => Temporary::new(class_list), None => { - let class_list = DOMTokenList::new(*self, "class").root(); + let class_list = DOMTokenList::new(self, "class").root(); self.class_list.assign(Some(class_list.deref().clone())); Temporary::from_rooted(*class_list) } @@ -568,24 +568,24 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-attributes - fn Attributes(&self) -> Temporary<NamedNodeMap> { + fn Attributes(self) -> Temporary<NamedNodeMap> { match self.attr_list.get() { None => (), Some(ref list) => return Temporary::new(list.clone()), } let doc = { - let node: JSRef<Node> = NodeCast::from_ref(*self); + let node: JSRef<Node> = NodeCast::from_ref(self); node.owner_doc().root() }; let window = doc.deref().window.root(); - let list = NamedNodeMap::new(*window, *self); + let list = NamedNodeMap::new(*window, self); self.attr_list.assign(Some(list)); Temporary::new(self.attr_list.get().get_ref().clone()) } // http://dom.spec.whatwg.org/#dom-element-getattribute - fn GetAttribute(&self, name: DOMString) -> Option<DOMString> { + fn GetAttribute(self, name: DOMString) -> Option<DOMString> { let name = if self.html_element_in_html_document() { name.as_slice().to_ascii_lower() } else { @@ -596,7 +596,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-getattributens - fn GetAttributeNS(&self, + fn GetAttributeNS(self, namespace: Option<DOMString>, local_name: DOMString) -> Option<DOMString> { let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace)); @@ -605,11 +605,11 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-setattribute - fn SetAttribute(&self, + fn SetAttribute(self, name: DOMString, value: DOMString) -> ErrorResult { { - let node: JSRef<Node> = NodeCast::from_ref(*self); + let node: JSRef<Node> = NodeCast::from_ref(self); node.wait_until_safe_to_modify_dom(); } @@ -636,12 +636,12 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-setattributens - fn SetAttributeNS(&self, + fn SetAttributeNS(self, namespace_url: Option<DOMString>, name: DOMString, value: DOMString) -> ErrorResult { { - let node: JSRef<Node> = NodeCast::from_ref(*self); + let node: JSRef<Node> = NodeCast::from_ref(self); node.wait_until_safe_to_modify_dom(); } @@ -705,7 +705,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-removeattribute - fn RemoveAttribute(&self, name: DOMString) { + fn RemoveAttribute(self, name: DOMString) { let name = if self.html_element_in_html_document() { name.as_slice().to_ascii_lower() } else { @@ -715,7 +715,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-removeattributens - fn RemoveAttributeNS(&self, + fn RemoveAttributeNS(self, namespace: Option<DOMString>, localname: DOMString) { let namespace = Namespace::from_str(null_str_as_empty_ref(&namespace)); @@ -723,38 +723,38 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dom.spec.whatwg.org/#dom-element-hasattribute - fn HasAttribute(&self, + fn HasAttribute(self, name: DOMString) -> bool { self.has_attribute(name.as_slice()) } // http://dom.spec.whatwg.org/#dom-element-hasattributens - fn HasAttributeNS(&self, + fn HasAttributeNS(self, namespace: Option<DOMString>, local_name: DOMString) -> bool { self.GetAttributeNS(namespace, local_name).is_some() } - fn GetElementsByTagName(&self, localname: DOMString) -> Temporary<HTMLCollection> { - let window = window_from_node(*self).root(); - HTMLCollection::by_tag_name(*window, NodeCast::from_ref(*self), localname) + fn GetElementsByTagName(self, localname: DOMString) -> Temporary<HTMLCollection> { + let window = window_from_node(self).root(); + HTMLCollection::by_tag_name(*window, NodeCast::from_ref(self), localname) } - fn GetElementsByTagNameNS(&self, maybe_ns: Option<DOMString>, + fn GetElementsByTagNameNS(self, maybe_ns: Option<DOMString>, localname: DOMString) -> Temporary<HTMLCollection> { - let window = window_from_node(*self).root(); - HTMLCollection::by_tag_name_ns(*window, NodeCast::from_ref(*self), localname, maybe_ns) + let window = window_from_node(self).root(); + HTMLCollection::by_tag_name_ns(*window, NodeCast::from_ref(self), localname, maybe_ns) } - fn GetElementsByClassName(&self, classes: DOMString) -> Temporary<HTMLCollection> { - let window = window_from_node(*self).root(); - HTMLCollection::by_class_name(*window, NodeCast::from_ref(*self), classes) + fn GetElementsByClassName(self, classes: DOMString) -> Temporary<HTMLCollection> { + let window = window_from_node(self).root(); + HTMLCollection::by_class_name(*window, NodeCast::from_ref(self), classes) } // http://dev.w3.org/csswg/cssom-view/#dom-element-getclientrects - fn GetClientRects(&self) -> Temporary<DOMRectList> { - let win = window_from_node(*self).root(); - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn GetClientRects(self) -> Temporary<DOMRectList> { + let win = window_from_node(self).root(); + let node: JSRef<Node> = NodeCast::from_ref(self); let rects = node.get_content_boxes(); let rects: Vec<Root<DOMRect>> = rects.iter().map(|r| { DOMRect::new( @@ -769,9 +769,9 @@ impl<'a> ElementMethods for JSRef<'a, Element> { } // http://dev.w3.org/csswg/cssom-view/#dom-element-getboundingclientrect - fn GetBoundingClientRect(&self) -> Temporary<DOMRect> { - let win = window_from_node(*self).root(); - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn GetBoundingClientRect(self) -> Temporary<DOMRect> { + let win = window_from_node(self).root(); + let node: JSRef<Node> = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); DOMRect::new( *win, @@ -781,45 +781,45 @@ impl<'a> ElementMethods for JSRef<'a, Element> { rect.origin.x + rect.size.width) } - fn GetInnerHTML(&self) -> Fallible<DOMString> { + fn GetInnerHTML(self) -> Fallible<DOMString> { //XXX TODO: XML case - Ok(serialize(&mut NodeIterator::new(NodeCast::from_ref(*self), false, false))) + Ok(serialize(&mut NodeIterator::new(NodeCast::from_ref(self), false, false))) } - fn GetOuterHTML(&self) -> Fallible<DOMString> { - Ok(serialize(&mut NodeIterator::new(NodeCast::from_ref(*self), true, false))) + fn GetOuterHTML(self) -> Fallible<DOMString> { + Ok(serialize(&mut NodeIterator::new(NodeCast::from_ref(self), true, false))) } // http://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(&self) -> Temporary<HTMLCollection> { - let window = window_from_node(*self).root(); - HTMLCollection::children(*window, NodeCast::from_ref(*self)) + fn Children(self) -> Temporary<HTMLCollection> { + let window = window_from_node(self).root(); + HTMLCollection::children(*window, NodeCast::from_ref(self)) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Temporary<Element>>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector(selectors) } // http://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { - let root: JSRef<Node> = NodeCast::from_ref(*self); + fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Temporary<NodeList>> { + let root: JSRef<Node> = NodeCast::from_ref(self); root.query_selector_all(selectors) } // http://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(&self) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Remove(self) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.remove_self(); } // http://dom.spec.whatwg.org/#dom-element-matches - fn Matches(&self, selectors: DOMString) -> Fallible<bool> { + fn Matches(self, selectors: DOMString) -> Fallible<bool> { match parse_selector_list_from_str(selectors.as_slice()) { Err(()) => Err(Syntax), Ok(ref selectors) => { - let root: JSRef<Node> = NodeCast::from_ref(*self); + let root: JSRef<Node> = NodeCast::from_ref(self); Ok(matches(selectors, &root, &mut None)) } } diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index e50acecb0e3..88270fde8eb 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -98,54 +98,54 @@ impl Event { } impl<'a> EventMethods for JSRef<'a, Event> { - fn EventPhase(&self) -> u16 { + fn EventPhase(self) -> u16 { self.phase.deref().get() as u16 } - fn Type(&self) -> DOMString { + fn Type(self) -> DOMString { self.type_.deref().borrow().clone() } - fn GetTarget(&self) -> Option<Temporary<EventTarget>> { + fn GetTarget(self) -> Option<Temporary<EventTarget>> { self.target.get().as_ref().map(|target| Temporary::new(target.clone())) } - fn GetCurrentTarget(&self) -> Option<Temporary<EventTarget>> { + fn GetCurrentTarget(self) -> Option<Temporary<EventTarget>> { self.current_target.get().as_ref().map(|target| Temporary::new(target.clone())) } - fn DefaultPrevented(&self) -> bool { + fn DefaultPrevented(self) -> bool { self.canceled.deref().get() } - fn PreventDefault(&self) { + fn PreventDefault(self) { if self.cancelable.deref().get() { self.canceled.deref().set(true) } } - fn StopPropagation(&self) { + fn StopPropagation(self) { self.stop_propagation.deref().set(true); } - fn StopImmediatePropagation(&self) { + fn StopImmediatePropagation(self) { self.stop_immediate.deref().set(true); self.stop_propagation.deref().set(true); } - fn Bubbles(&self) -> bool { + fn Bubbles(self) -> bool { self.bubbles.deref().get() } - fn Cancelable(&self) -> bool { + fn Cancelable(self) -> bool { self.cancelable.deref().get() } - fn TimeStamp(&self) -> u64 { + fn TimeStamp(self) -> u64 { self.timestamp } - fn InitEvent(&self, + fn InitEvent(self, type_: DOMString, bubbles: bool, cancelable: bool) { @@ -163,7 +163,7 @@ impl<'a> EventMethods for JSRef<'a, Event> { self.cancelable.deref().set(cancelable); } - fn IsTrusted(&self) -> bool { + fn IsTrusted(self) -> bool { self.trusted.deref().get() } } diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 57c7fabd2d1..d2c2dcb7585 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -225,7 +225,7 @@ impl<'a> EventTargetHelpers for JSRef<'a, EventTarget> { } impl<'a> EventTargetMethods for JSRef<'a, EventTarget> { - fn AddEventListener(&self, + fn AddEventListener(self, ty: DOMString, listener: Option<EventListener>, capture: bool) { @@ -246,7 +246,7 @@ impl<'a> EventTargetMethods for JSRef<'a, EventTarget> { } } - fn RemoveEventListener(&self, + fn RemoveEventListener(self, ty: DOMString, listener: Option<EventListener>, capture: bool) { @@ -270,7 +270,7 @@ impl<'a> EventTargetMethods for JSRef<'a, EventTarget> { } } - fn DispatchEvent(&self, event: JSRef<Event>) -> Fallible<bool> { + fn DispatchEvent(self, event: JSRef<Event>) -> Fallible<bool> { self.dispatch_event_with_target(None, event) } } diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 151db9132b0..52ea7feff74 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -36,8 +36,8 @@ impl File { } } -impl FileMethods for File { - fn Name(&self) -> DOMString { +impl<'a> FileMethods for JSRef<'a, File> { + fn Name(self) -> DOMString { self.name.clone() } } diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 7e5f22845de..4374a55067e 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -56,22 +56,22 @@ impl FormData { impl<'a> FormDataMethods for JSRef<'a, FormData> { #[allow(unrooted_must_root)] - fn Append(&self, name: DOMString, value: JSRef<Blob>, filename: Option<DOMString>) { + fn Append(self, name: DOMString, value: JSRef<Blob>, filename: Option<DOMString>) { let file = FileData(JS::from_rooted(self.get_file_from_blob(value, filename))); self.data.deref().borrow_mut().insert_or_update_with(name.clone(), vec!(file.clone()), |_k, v| {v.push(file.clone());}); } - fn Append_(&self, name: DOMString, value: DOMString) { + fn Append_(self, name: DOMString, value: DOMString) { self.data.deref().borrow_mut().insert_or_update_with(name, vec!(StringData(value.clone())), |_k, v| {v.push(StringData(value.clone()));}); } - fn Delete(&self, name: DOMString) { + fn Delete(self, name: DOMString) { self.data.deref().borrow_mut().remove(&name); } - fn Get(&self, name: DOMString) -> Option<FileOrString> { + fn Get(self, name: DOMString) -> Option<FileOrString> { if self.data.deref().borrow().contains_key_equiv(&name) { match self.data.deref().borrow().get(&name)[0].clone() { StringData(ref s) => Some(eString(s.clone())), @@ -84,16 +84,16 @@ impl<'a> FormDataMethods for JSRef<'a, FormData> { } } - fn Has(&self, name: DOMString) -> bool { + fn Has(self, name: DOMString) -> bool { self.data.deref().borrow().contains_key_equiv(&name) } #[allow(unrooted_must_root)] - fn Set(&self, name: DOMString, value: JSRef<Blob>, filename: Option<DOMString>) { + fn Set(self, name: DOMString, value: JSRef<Blob>, filename: Option<DOMString>) { let file = FileData(JS::from_rooted(self.get_file_from_blob(value, filename))); self.data.deref().borrow_mut().insert(name, vec!(file)); } - fn Set_(&self, name: DOMString, value: DOMString) { + fn Set_(self, name: DOMString, value: DOMString) { self.data.deref().borrow_mut().insert(name, vec!(StringData(value))); } } diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 1860f685d9a..728b9c07fb6 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -122,13 +122,13 @@ impl Reflectable for HTMLAnchorElement { } impl<'a> HTMLAnchorElementMethods for JSRef<'a, HTMLAnchorElement> { - fn Text(&self) -> DOMString { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Text(self) -> DOMString { + let node: JSRef<Node> = NodeCast::from_ref(self); node.GetTextContent().unwrap() } - fn SetText(&self, value: DOMString) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn SetText(self, value: DOMString) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } } diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index 96728eaa3f6..efdf4065145 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -47,13 +47,13 @@ impl HTMLBodyElement { } impl<'a> HTMLBodyElementMethods for JSRef<'a, HTMLBodyElement> { - fn GetOnunload(&self) -> Option<EventHandlerNonNull> { - let win = window_from_node(*self).root(); + fn GetOnunload(self) -> Option<EventHandlerNonNull> { + let win = window_from_node(self).root(); win.deref().GetOnunload() } - fn SetOnunload(&self, listener: Option<EventHandlerNonNull>) { - let win = window_from_node(*self).root(); + fn SetOnunload(self, listener: Option<EventHandlerNonNull>) { + let win = window_from_node(self).root(); win.deref().SetOnunload(listener) } } diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 9de41db4423..c3b0b0e50f8 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -46,8 +46,8 @@ impl HTMLButtonElement { } impl<'a> HTMLButtonElementMethods for JSRef<'a, HTMLButtonElement> { - fn Validity(&self) -> Temporary<ValidityState> { - let window = window_from_node(*self).root(); + fn Validity(self) -> Temporary<ValidityState> { + let window = window_from_node(self).root(); ValidityState::new(*window) } @@ -55,8 +55,8 @@ impl<'a> HTMLButtonElementMethods for JSRef<'a, HTMLButtonElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 501e905ef55..be12b3042ef 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -61,33 +61,33 @@ impl HTMLCanvasElement { } impl<'a> HTMLCanvasElementMethods for JSRef<'a, HTMLCanvasElement> { - fn Width(&self) -> u32 { + fn Width(self) -> u32 { self.width.get() } - fn SetWidth(&self, width: u32) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetWidth(self, width: u32) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_uint_attribute("width", width) } - fn Height(&self) -> u32 { + fn Height(self) -> u32 { self.height.get() } - fn SetHeight(&self, height: u32) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetHeight(self, height: u32) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_uint_attribute("height", height) } - fn GetContext(&self, id: DOMString) -> Option<Temporary<CanvasRenderingContext2D>> { + fn GetContext(self, id: DOMString) -> Option<Temporary<CanvasRenderingContext2D>> { if id.as_slice() != "2d" { return None; } if self.context.get().is_none() { - let window = window_from_node(*self).root(); + let window = window_from_node(self).root(); let (w, h) = (self.width.get() as i32, self.height.get() as i32); - let context = CanvasRenderingContext2D::new(&Window(*window), *self, Size2D(w, h)); + let context = CanvasRenderingContext2D::new(&Window(*window), self, Size2D(w, h)); self.context.assign(Some(context)); } self.context.get().map(|context| Temporary::new(context)) diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index d5de946acdd..6a4baf3f5dc 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -172,7 +172,7 @@ impl HTMLCollection { impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> { // http://dom.spec.whatwg.org/#dom-htmlcollection-length - fn Length(&self) -> u32 { + fn Length(self) -> u32 { match self.collection { Static(ref elems) => elems.len() as u32, Live(ref root, ref filter) => { @@ -187,7 +187,7 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> { } // http://dom.spec.whatwg.org/#dom-htmlcollection-item - fn Item(&self, index: u32) -> Option<Temporary<Element>> { + fn Item(self, index: u32) -> Option<Temporary<Element>> { match self.collection { Static(ref elems) => elems .as_slice() @@ -209,7 +209,7 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> { } // http://dom.spec.whatwg.org/#dom-htmlcollection-nameditem - fn NamedItem(&self, key: DOMString) -> Option<Temporary<Element>> { + fn NamedItem(self, key: DOMString) -> Option<Temporary<Element>> { // Step 1. if key.is_empty() { return None; @@ -239,13 +239,13 @@ impl<'a> HTMLCollectionMethods for JSRef<'a, HTMLCollection> { } } - fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Temporary<Element>> { + fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Temporary<Element>> { let maybe_elem = self.Item(index); *found = maybe_elem.is_some(); maybe_elem } - fn NamedGetter(&self, name: DOMString, found: &mut bool) -> Option<Temporary<Element>> { + fn NamedGetter(self, name: DOMString, found: &mut bool) -> Option<Temporary<Element>> { let maybe_elem = self.NamedItem(name); *found = maybe_elem.is_some(); maybe_elem diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index cd82390a9a4..6ca6cb7fe3d 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -43,14 +43,14 @@ impl HTMLDataListElement { } impl<'a> HTMLDataListElementMethods for JSRef<'a, HTMLDataListElement> { - fn Options(&self) -> Temporary<HTMLCollection> { + fn Options(self) -> Temporary<HTMLCollection> { struct HTMLDataListOptionsFilter; impl CollectionFilter for HTMLDataListOptionsFilter { fn filter(&self, elem: JSRef<Element>, _root: JSRef<Node>) -> bool { elem.is_htmloptionelement() } } - let node: JSRef<Node> = NodeCast::from_ref(*self); + let node: JSRef<Node> = NodeCast::from_ref(self); let filter = box HTMLDataListOptionsFilter; let window = window_from_node(node).root(); HTMLCollection::create(*window, node, filter) diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 42744ba32a0..4d9dccab7c9 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -63,28 +63,28 @@ impl<'a> PrivateHTMLElementHelpers for JSRef<'a, HTMLElement> { } impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { - fn GetOnclick(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnclick(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("click") } - fn SetOnclick(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnclick(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("click", listener) } - fn GetOnload(&self) -> Option<EventHandlerNonNull> { + fn GetOnload(self) -> Option<EventHandlerNonNull> { if self.is_body_or_frameset() { - let win = window_from_node(*self).root(); + let win = window_from_node(self).root(); win.deref().GetOnload() } else { None } } - fn SetOnload(&self, listener: Option<EventHandlerNonNull>) { + fn SetOnload(self, listener: Option<EventHandlerNonNull>) { if self.is_body_or_frameset() { - let win = window_from_node(*self).root(); + let win = window_from_node(self).root(); win.deref().SetOnload(listener) } } diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 103c8a60332..4f5b1bb7fde 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -49,7 +49,7 @@ impl HTMLFieldSetElement { impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> { // http://www.whatwg.org/html/#dom-fieldset-elements - fn Elements(&self) -> Temporary<HTMLCollection> { + fn Elements(self) -> Temporary<HTMLCollection> { struct ElementsFilter; impl CollectionFilter for ElementsFilter { fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool { @@ -59,14 +59,14 @@ impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> { elem != root && tag_names.iter().any(|&tag_name| tag_name == elem.deref().local_name.as_slice()) } } - let node: JSRef<Node> = NodeCast::from_ref(*self); + let node: JSRef<Node> = NodeCast::from_ref(self); let filter = box ElementsFilter; let window = window_from_node(node).root(); HTMLCollection::create(*window, node, filter) } - fn Validity(&self) -> Temporary<ValidityState> { - let window = window_from_node(*self).root(); + fn Validity(self) -> Temporary<ValidityState> { + let window = window_from_node(self).root(); ValidityState::new(*window) } @@ -74,8 +74,8 @@ impl<'a> HTMLFieldSetElementMethods for JSRef<'a, HTMLFieldSetElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fieldset-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index f8cf746bce2..0c2e5d4d6b4 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -131,29 +131,29 @@ impl HTMLIFrameElement { } impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> { - fn Src(&self) -> DOMString { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn Src(self) -> DOMString { + let element: JSRef<Element> = ElementCast::from_ref(self); element.get_string_attribute("src") } - fn SetSrc(&self, src: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetSrc(self, src: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_url_attribute("src", src) } - fn Sandbox(&self) -> DOMString { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn Sandbox(self) -> DOMString { + let element: JSRef<Element> = ElementCast::from_ref(self); element.get_string_attribute("sandbox") } - fn SetSandbox(&self, sandbox: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetSandbox(self, sandbox: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("sandbox", sandbox); } - fn GetContentWindow(&self) -> Option<Temporary<Window>> { + fn GetContentWindow(self) -> Option<Temporary<Window>> { self.size.deref().get().and_then(|size| { - let window = window_from_node(*self).root(); + let window = window_from_node(self).root(); let children = &*window.deref().page.children.deref().borrow(); let child = children.iter().find(|child| { child.subpage_id.unwrap() == size.subpage_id diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index f534182a53c..faac2c8d037 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -99,93 +99,93 @@ impl LayoutHTMLImageElementHelpers for JS<HTMLImageElement> { impl<'a> HTMLImageElementMethods for JSRef<'a, HTMLImageElement> { make_getter!(Alt) - fn SetAlt(&self, alt: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetAlt(self, alt: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("alt", alt) } make_getter!(Src) - fn SetSrc(&self, src: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetSrc(self, src: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_url_attribute("src", src) } make_getter!(UseMap) - fn SetUseMap(&self, use_map: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetUseMap(self, use_map: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("usemap", use_map) } make_bool_getter!(IsMap) - fn SetIsMap(&self, is_map: bool) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetIsMap(self, is_map: bool) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("ismap", is_map.to_string()) } - fn Width(&self) -> u32 { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Width(self) -> u32 { + let node: JSRef<Node> = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); to_px(rect.size.width) as u32 } - fn SetWidth(&self, width: u32) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetWidth(self, width: u32) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_uint_attribute("width", width) } - fn Height(&self) -> u32 { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Height(self) -> u32 { + let node: JSRef<Node> = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); to_px(rect.size.height) as u32 } - fn SetHeight(&self, height: u32) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetHeight(self, height: u32) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_uint_attribute("height", height) } make_getter!(Name) - fn SetName(&self, name: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetName(self, name: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("name", name) } make_getter!(Align) - fn SetAlign(&self, align: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetAlign(self, align: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("align", align) } make_uint_getter!(Hspace) - fn SetHspace(&self, hspace: u32) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetHspace(self, hspace: u32) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_uint_attribute("hspace", hspace) } make_uint_getter!(Vspace) - fn SetVspace(&self, vspace: u32) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetVspace(self, vspace: u32) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_uint_attribute("vspace", vspace) } make_getter!(LongDesc) - fn SetLongDesc(&self, longdesc: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetLongDesc(self, longdesc: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("longdesc", longdesc) } make_getter!(Border) - fn SetBorder(&self, border: DOMString) { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn SetBorder(self, border: DOMString) { + let element: JSRef<Element> = ElementCast::from_ref(self); element.set_string_attribute("border", border) } } diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 6b6484b0d45..256bea5b710 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -49,8 +49,8 @@ impl<'a> HTMLInputElementMethods for JSRef<'a, HTMLInputElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index d8ed9116559..98d5dc25e00 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -83,8 +83,8 @@ pub fn is_image_data(uri: &str) -> bool { } impl<'a> HTMLObjectElementMethods for JSRef<'a, HTMLObjectElement> { - fn Validity(&self) -> Temporary<ValidityState> { - let window = window_from_node(*self).root(); + fn Validity(self) -> Temporary<ValidityState> { + let window = window_from_node(self).root(); ValidityState::new(*window) } } diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index cd7649e0048..b7bdfe4c93b 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -49,8 +49,8 @@ impl<'a> HTMLOptGroupElementMethods for JSRef<'a, HTMLOptGroupElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html#dom-optgroup-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index bb40b4c5b7c..fd0740ba172 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -49,8 +49,8 @@ impl<'a> HTMLOptionElementMethods for JSRef<'a, HTMLOptionElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-option-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index 219a8ed227a..452ab89d8ed 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -42,8 +42,8 @@ impl HTMLOutputElement { } impl<'a> HTMLOutputElementMethods for JSRef<'a, HTMLOutputElement> { - fn Validity(&self) -> Temporary<ValidityState> { - let window = window_from_node(*self).root(); + fn Validity(self) -> Temporary<ValidityState> { + let window = window_from_node(self).root(); ValidityState::new(*window) } } diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 43ba78176d1..d16fc56d72f 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -107,20 +107,20 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { - fn Src(&self) -> DOMString { - let element: JSRef<Element> = ElementCast::from_ref(*self); + fn Src(self) -> DOMString { + let element: JSRef<Element> = ElementCast::from_ref(self); element.get_url_attribute("src") } // http://www.whatwg.org/html/#dom-script-text - fn Text(&self) -> DOMString { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Text(self) -> DOMString { + let node: JSRef<Node> = NodeCast::from_ref(self); Node::collect_text_contents(node.children()) } // http://www.whatwg.org/html/#dom-script-text - fn SetText(&self, value: DOMString) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn SetText(self, value: DOMString) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } } diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 1d720ca8eb7..0a96b1ef82c 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -48,21 +48,21 @@ impl HTMLSelectElement { } impl<'a> HTMLSelectElementMethods for JSRef<'a, HTMLSelectElement> { - fn Validity(&self) -> Temporary<ValidityState> { - let window = window_from_node(*self).root(); + fn Validity(self) -> Temporary<ValidityState> { + let window = window_from_node(self).root(); ValidityState::new(*window) } // Note: this function currently only exists for test_union.html. - fn Add(&self, _element: HTMLOptionElementOrHTMLOptGroupElement, _before: Option<HTMLElementOrLong>) { + fn Add(self, _element: HTMLOptionElementOrHTMLOptGroupElement, _before: Option<HTMLElementOrLong>) { } // http://www.whatwg.org/html/#dom-fe-disabled make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 09c0bf8c886..c54be9fedb5 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -50,10 +50,9 @@ impl Reflectable for HTMLTableElement { } impl<'a> HTMLTableElementMethods for JSRef<'a, HTMLTableElement> { - // http://www.whatwg.org/html/#dom-table-caption - fn GetCaption(&self) -> Option<Temporary<HTMLTableCaptionElement>> { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn GetCaption(self) -> Option<Temporary<HTMLTableCaptionElement>> { + let node: JSRef<Node> = NodeCast::from_ref(self); node.children().find(|child| { child.type_id() == ElementNodeTypeId(HTMLTableCaptionElementTypeId) }).map(|node| { @@ -62,8 +61,8 @@ impl<'a> HTMLTableElementMethods for JSRef<'a, HTMLTableElement> { } // http://www.whatwg.org/html/#dom-table-caption - fn SetCaption(&self, new_caption: Option<JSRef<HTMLTableCaptionElement>>) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn SetCaption(self, new_caption: Option<JSRef<HTMLTableCaptionElement>>) { + let node: JSRef<Node> = NodeCast::from_ref(self); let old_caption = self.GetCaption(); match old_caption { diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 47d4b2c0e4b..39d28967f5f 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -49,8 +49,8 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> { make_bool_getter!(Disabled) // http://www.whatwg.org/html/#dom-fe-disabled - fn SetDisabled(&self, disabled: bool) { - let elem: JSRef<Element> = ElementCast::from_ref(*self); + fn SetDisabled(self, disabled: bool) { + let elem: JSRef<Element> = ElementCast::from_ref(self); elem.set_bool_attribute("disabled", disabled) } } diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index 7f4a3bbeda6..c10566ff032 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -44,8 +44,8 @@ impl HTMLTitleElement { impl<'a> HTMLTitleElementMethods for JSRef<'a, HTMLTitleElement> { // http://www.whatwg.org/html/#dom-title-text - fn Text(&self) -> DOMString { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn Text(self) -> DOMString { + let node: JSRef<Node> = NodeCast::from_ref(self); let mut content = String::new(); for child in node.children() { let text: Option<JSRef<Text>> = TextCast::to_ref(child); @@ -58,8 +58,8 @@ impl<'a> HTMLTitleElementMethods for JSRef<'a, HTMLTitleElement> { } // http://www.whatwg.org/html/#dom-title-text - fn SetText(&self, value: DOMString) { - let node: JSRef<Node> = NodeCast::from_ref(*self); + fn SetText(self, value: DOMString) { + let node: JSRef<Node> = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } } diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index 8217c91e4f6..0b13916aaea 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -38,15 +38,15 @@ impl Location { } impl<'a> LocationMethods for JSRef<'a, Location> { - fn Href(&self) -> DOMString { + fn Href(self) -> DOMString { UrlHelper::Href(&self.page.get_url()) } - fn Search(&self) -> DOMString { + fn Search(self) -> DOMString { UrlHelper::Search(&self.page.get_url()) } - fn Hash(&self) -> DOMString { + fn Hash(self) -> DOMString { UrlHelper::Hash(&self.page.get_url()) } } diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 20eb2afea16..c9d7550b7ea 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -7,11 +7,11 @@ #[macro_export] macro_rules! make_getter( ( $attr:ident ) => ( - fn $attr(&self) -> DOMString { + fn $attr(self) -> DOMString { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; use std::ascii::StrAsciiExt; - let element: JSRef<Element> = ElementCast::from_ref(*self); + let element: JSRef<Element> = ElementCast::from_ref(self); element.get_string_attribute(stringify!($attr).to_ascii_lower().as_slice()) } ); @@ -20,11 +20,11 @@ macro_rules! make_getter( #[macro_export] macro_rules! make_bool_getter( ( $attr:ident ) => ( - fn $attr(&self) -> bool { + fn $attr(self) -> bool { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; use std::ascii::StrAsciiExt; - let element: JSRef<Element> = ElementCast::from_ref(*self); + let element: JSRef<Element> = ElementCast::from_ref(self); element.has_attribute(stringify!($attr).to_ascii_lower().as_slice()) } ); @@ -33,11 +33,11 @@ macro_rules! make_bool_getter( #[macro_export] macro_rules! make_uint_getter( ( $attr:ident ) => ( - fn $attr(&self) -> u32 { + fn $attr(self) -> u32 { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; use std::ascii::StrAsciiExt; - let element: JSRef<Element> = ElementCast::from_ref(*self); + let element: JSRef<Element> = ElementCast::from_ref(self); element.get_uint_attribute(stringify!($attr).to_ascii_lower().as_slice()) } ); diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 50115176f60..ed716b68f59 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -80,15 +80,15 @@ impl MessageEvent { } impl<'a> MessageEventMethods for JSRef<'a, MessageEvent> { - fn Data(&self, _cx: *mut JSContext) -> JSVal { + fn Data(self, _cx: *mut JSContext) -> JSVal { *self.data } - fn Origin(&self) -> DOMString { + fn Origin(self) -> DOMString { self.origin.clone() } - fn LastEventId(&self) -> DOMString { + fn LastEventId(self) -> DOMString { self.lastEventId.clone() } } diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index ba6253e028d..da9377a5718 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -104,47 +104,47 @@ impl MouseEvent { } impl<'a> MouseEventMethods for JSRef<'a, MouseEvent> { - fn ScreenX(&self) -> i32 { + fn ScreenX(self) -> i32 { self.screen_x.deref().get() } - fn ScreenY(&self) -> i32 { + fn ScreenY(self) -> i32 { self.screen_y.deref().get() } - fn ClientX(&self) -> i32 { + fn ClientX(self) -> i32 { self.client_x.deref().get() } - fn ClientY(&self) -> i32 { + fn ClientY(self) -> i32 { self.client_y.deref().get() } - fn CtrlKey(&self) -> bool { + fn CtrlKey(self) -> bool { self.ctrl_key.deref().get() } - fn ShiftKey(&self) -> bool { + fn ShiftKey(self) -> bool { self.shift_key.deref().get() } - fn AltKey(&self) -> bool { + fn AltKey(self) -> bool { self.alt_key.deref().get() } - fn MetaKey(&self) -> bool { + fn MetaKey(self) -> bool { self.meta_key.deref().get() } - fn Button(&self) -> i16 { + fn Button(self) -> i16 { self.button.deref().get() } - fn GetRelatedTarget(&self) -> Option<Temporary<EventTarget>> { + fn GetRelatedTarget(self) -> Option<Temporary<EventTarget>> { self.related_target.get().clone().map(|target| Temporary::new(target)) } - fn InitMouseEvent(&self, + fn InitMouseEvent(self, typeArg: DOMString, canBubbleArg: bool, cancelableArg: bool, @@ -160,7 +160,7 @@ impl<'a> MouseEventMethods for JSRef<'a, MouseEvent> { metaKeyArg: bool, buttonArg: i16, relatedTargetArg: Option<JSRef<EventTarget>>) { - let uievent: JSRef<UIEvent> = UIEventCast::from_ref(*self); + let uievent: JSRef<UIEvent> = UIEventCast::from_ref(self); uievent.InitUIEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg); self.screen_x.deref().set(screenXArg); self.screen_y.deref().set(screenYArg); diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index d6b3c4f9e59..bd4ae4f1008 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -33,15 +33,15 @@ impl NamedNodeMap { } impl<'a> NamedNodeMapMethods for JSRef<'a, NamedNodeMap> { - fn Length(&self) -> u32 { + fn Length(self) -> u32 { self.owner.root().attrs.borrow().len() as u32 } - fn Item(&self, index: u32) -> Option<Temporary<Attr>> { + fn Item(self, index: u32) -> Option<Temporary<Attr>> { self.owner.root().attrs.borrow().as_slice().get(index as uint).map(|x| Temporary::new(x.clone())) } - fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Temporary<Attr>> { + fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Temporary<Attr>> { let item = self.Item(index); *found = item.is_some(); item diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 06b6c90f57b..ba01be87ff0 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -32,23 +32,23 @@ impl Navigator { } impl<'a> NavigatorMethods for JSRef<'a, Navigator> { - fn Product(&self) -> DOMString { + fn Product(self) -> DOMString { NavigatorInfo::Product() } - fn TaintEnabled(&self) -> bool { + fn TaintEnabled(self) -> bool { NavigatorInfo::TaintEnabled() } - fn AppName(&self) -> DOMString { + fn AppName(self) -> DOMString { NavigatorInfo::AppName() } - fn AppCodeName(&self) -> DOMString { + fn AppCodeName(self) -> DOMString { NavigatorInfo::AppCodeName() } - fn Platform(&self) -> DOMString { + fn Platform(self) -> DOMString { NavigatorInfo::Platform() } } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index a95123d0bc7..786445bf628 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1485,7 +1485,7 @@ impl Node { impl<'a> NodeMethods for JSRef<'a, Node> { // http://dom.spec.whatwg.org/#dom-node-nodetype - fn NodeType(&self) -> u16 { + fn NodeType(self) -> u16 { match self.type_id { ElementNodeTypeId(_) => NodeConstants::ELEMENT_NODE, TextNodeTypeId => NodeConstants::TEXT_NODE, @@ -1498,21 +1498,21 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-nodename - fn NodeName(&self) -> DOMString { + fn NodeName(self) -> DOMString { match self.type_id { ElementNodeTypeId(..) => { - let elem: JSRef<Element> = ElementCast::to_ref(*self).unwrap(); + let elem: JSRef<Element> = ElementCast::to_ref(self).unwrap(); elem.TagName() } TextNodeTypeId => "#text".to_string(), ProcessingInstructionNodeTypeId => { let processing_instruction: JSRef<ProcessingInstruction> = - ProcessingInstructionCast::to_ref(*self).unwrap(); + ProcessingInstructionCast::to_ref(self).unwrap(); processing_instruction.Target() } CommentNodeTypeId => "#comment".to_string(), DoctypeNodeTypeId => { - let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(*self).unwrap(); + let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(self).unwrap(); doctype.deref().name.clone() }, DocumentFragmentNodeTypeId => "#document-fragment".to_string(), @@ -1521,13 +1521,13 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-baseuri - fn GetBaseURI(&self) -> Option<DOMString> { + fn GetBaseURI(self) -> Option<DOMString> { // FIXME (#1824) implement. None } // http://dom.spec.whatwg.org/#dom-node-ownerdocument - fn GetOwnerDocument(&self) -> Option<Temporary<Document>> { + fn GetOwnerDocument(self) -> Option<Temporary<Document>> { match self.type_id { ElementNodeTypeId(..) | CommentNodeTypeId | @@ -1540,12 +1540,12 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-parentnode - fn GetParentNode(&self) -> Option<Temporary<Node>> { + fn GetParentNode(self) -> Option<Temporary<Node>> { self.parent_node.get().map(|node| Temporary::new(node)) } // http://dom.spec.whatwg.org/#dom-node-parentelement - fn GetParentElement(&self) -> Option<Temporary<Element>> { + fn GetParentElement(self) -> Option<Temporary<Element>> { self.parent_node.get() .and_then(|parent| { let parent = parent.root(); @@ -1556,12 +1556,12 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-haschildnodes - fn HasChildNodes(&self) -> bool { + fn HasChildNodes(self) -> bool { self.first_child.get().is_some() } // http://dom.spec.whatwg.org/#dom-node-childnodes - fn ChildNodes(&self) -> Temporary<NodeList> { + fn ChildNodes(self) -> Temporary<NodeList> { match self.child_list.get() { None => (), Some(ref list) => return Temporary::new(list.clone()), @@ -1569,38 +1569,38 @@ impl<'a> NodeMethods for JSRef<'a, Node> { let doc = self.owner_doc().root(); let window = doc.deref().window.root(); - let child_list = NodeList::new_child_list(*window, *self); + let child_list = NodeList::new_child_list(*window, self); self.child_list.assign(Some(child_list)); Temporary::new(self.child_list.get().get_ref().clone()) } // http://dom.spec.whatwg.org/#dom-node-firstchild - fn GetFirstChild(&self) -> Option<Temporary<Node>> { + fn GetFirstChild(self) -> Option<Temporary<Node>> { self.first_child.get().map(|node| Temporary::new(node)) } // http://dom.spec.whatwg.org/#dom-node-lastchild - fn GetLastChild(&self) -> Option<Temporary<Node>> { + fn GetLastChild(self) -> Option<Temporary<Node>> { self.last_child.get().map(|node| Temporary::new(node)) } // http://dom.spec.whatwg.org/#dom-node-previoussibling - fn GetPreviousSibling(&self) -> Option<Temporary<Node>> { + fn GetPreviousSibling(self) -> Option<Temporary<Node>> { self.prev_sibling.get().map(|node| Temporary::new(node)) } // http://dom.spec.whatwg.org/#dom-node-nextsibling - fn GetNextSibling(&self) -> Option<Temporary<Node>> { + fn GetNextSibling(self) -> Option<Temporary<Node>> { self.next_sibling.get().map(|node| Temporary::new(node)) } // http://dom.spec.whatwg.org/#dom-node-nodevalue - fn GetNodeValue(&self) -> Option<DOMString> { + fn GetNodeValue(self) -> Option<DOMString> { match self.type_id { CommentNodeTypeId | TextNodeTypeId | ProcessingInstructionNodeTypeId => { - let chardata: JSRef<CharacterData> = CharacterDataCast::to_ref(*self).unwrap(); + let chardata: JSRef<CharacterData> = CharacterDataCast::to_ref(self).unwrap(); Some(chardata.Data()) } _ => { @@ -1610,7 +1610,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-nodevalue - fn SetNodeValue(&self, val: Option<DOMString>) { + fn SetNodeValue(self, val: Option<DOMString>) { match self.type_id { CommentNodeTypeId | TextNodeTypeId | @@ -1622,7 +1622,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-textcontent - fn GetTextContent(&self) -> Option<DOMString> { + fn GetTextContent(self) -> Option<DOMString> { match self.type_id { DocumentFragmentNodeTypeId | ElementNodeTypeId(..) => { @@ -1632,7 +1632,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { CommentNodeTypeId | TextNodeTypeId | ProcessingInstructionNodeTypeId => { - let characterdata: JSRef<CharacterData> = CharacterDataCast::to_ref(*self).unwrap(); + let characterdata: JSRef<CharacterData> = CharacterDataCast::to_ref(self).unwrap(); Some(characterdata.Data()) } DoctypeNodeTypeId | @@ -1643,7 +1643,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-textcontent - fn SetTextContent(&self, value: Option<DOMString>) { + fn SetTextContent(self, value: Option<DOMString>) { let value = null_str_as_empty(&value); match self.type_id { DocumentFragmentNodeTypeId | @@ -1657,14 +1657,14 @@ impl<'a> NodeMethods for JSRef<'a, Node> { }.root(); // Step 3. - Node::replace_all(node.root_ref(), *self); + Node::replace_all(node.root_ref(), self); } CommentNodeTypeId | TextNodeTypeId | ProcessingInstructionNodeTypeId => { self.wait_until_safe_to_modify_dom(); - let characterdata: JSRef<CharacterData> = CharacterDataCast::to_ref(*self).unwrap(); + let characterdata: JSRef<CharacterData> = CharacterDataCast::to_ref(self).unwrap(); *characterdata.data.deref().borrow_mut() = value; // Notify the document that the content of this node is different @@ -1677,17 +1677,17 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-insertbefore - fn InsertBefore(&self, node: JSRef<Node>, child: Option<JSRef<Node>>) -> Fallible<Temporary<Node>> { - Node::pre_insert(node, *self, child) + fn InsertBefore(self, node: JSRef<Node>, child: Option<JSRef<Node>>) -> Fallible<Temporary<Node>> { + Node::pre_insert(node, self, child) } // http://dom.spec.whatwg.org/#dom-node-appendchild - fn AppendChild(&self, node: JSRef<Node>) -> Fallible<Temporary<Node>> { - Node::pre_insert(node, *self, None) + fn AppendChild(self, node: JSRef<Node>) -> Fallible<Temporary<Node>> { + Node::pre_insert(node, self, None) } // http://dom.spec.whatwg.org/#concept-node-replace - fn ReplaceChild(&self, node: JSRef<Node>, child: JSRef<Node>) -> Fallible<Temporary<Node>> { + fn ReplaceChild(self, node: JSRef<Node>, child: JSRef<Node>) -> Fallible<Temporary<Node>> { // Step 1. match self.type_id { @@ -1698,7 +1698,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // Step 2. - if node.is_inclusive_ancestor_of(*self) { + if node.is_inclusive_ancestor_of(self) { return Err(HierarchyRequest); } @@ -1789,15 +1789,15 @@ impl<'a> NodeMethods for JSRef<'a, Node> { }; // Step 9. - let document = document_from_node(*self).root(); + let document = document_from_node(self).root(); Node::adopt(node, *document); { // Step 10. - Node::remove(child, *self, Suppressed); + Node::remove(child, self, Suppressed); // Step 11. - Node::insert(node, *self, reference_child, Suppressed); + Node::insert(node, self, reference_child, Suppressed); } // Step 12-14. @@ -1816,13 +1816,13 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-removechild - fn RemoveChild(&self, node: JSRef<Node>) + fn RemoveChild(self, node: JSRef<Node>) -> Fallible<Temporary<Node>> { - Node::pre_remove(node, *self) + Node::pre_remove(node, self) } // http://dom.spec.whatwg.org/#dom-node-normalize - fn Normalize(&self) { + fn Normalize(self) { let mut prev_text = None; for child in self.children() { if child.is_text() { @@ -1848,15 +1848,15 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-clonenode - fn CloneNode(&self, deep: bool) -> Temporary<Node> { + fn CloneNode(self, deep: bool) -> Temporary<Node> { match deep { - true => Node::clone(*self, None, CloneChildren), - false => Node::clone(*self, None, DoNotCloneChildren) + true => Node::clone(self, None, CloneChildren), + false => Node::clone(self, None, DoNotCloneChildren) } } // http://dom.spec.whatwg.org/#dom-node-isequalnode - fn IsEqualNode(&self, maybe_node: Option<JSRef<Node>>) -> bool { + fn IsEqualNode(self, maybe_node: Option<JSRef<Node>>) -> bool { fn is_equal_doctype(node: JSRef<Node>, other: JSRef<Node>) -> bool { let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(node).unwrap(); let other_doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(other).unwrap(); @@ -1931,13 +1931,13 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // Step 1. None => false, // Step 2-6. - Some(node) => is_equal_node(*self, node) + Some(node) => is_equal_node(self, node) } } // http://dom.spec.whatwg.org/#dom-node-comparedocumentposition - fn CompareDocumentPosition(&self, other: JSRef<Node>) -> u16 { - if *self == other { + fn CompareDocumentPosition(self, other: JSRef<Node>) -> u16 { + if self == other { // step 2. 0 } else { @@ -1952,7 +1952,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { lastself = ancestor.clone(); } for ancestor in other.ancestors() { - if ancestor == *self { + if ancestor == self { // step 5. return NodeConstants::DOCUMENT_POSITION_CONTAINED_BY + NodeConstants::DOCUMENT_POSITION_FOLLOWING; @@ -1961,7 +1961,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } if lastself != lastother { - let abstract_uint: uintptr_t = as_uintptr(&*self); + let abstract_uint: uintptr_t = as_uintptr(&self); let other_uint: uintptr_t = as_uintptr(&*other); let random = if abstract_uint < other_uint { @@ -1980,7 +1980,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // step 6. return NodeConstants::DOCUMENT_POSITION_PRECEDING; } - if child == *self { + if child == self { // step 7. return NodeConstants::DOCUMENT_POSITION_FOLLOWING; } @@ -1990,7 +1990,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-contains - fn Contains(&self, maybe_other: Option<JSRef<Node>>) -> bool { + fn Contains(self, maybe_other: Option<JSRef<Node>>) -> bool { match maybe_other { None => false, Some(other) => self.is_inclusive_ancestor_of(other) @@ -1998,19 +1998,19 @@ impl<'a> NodeMethods for JSRef<'a, Node> { } // http://dom.spec.whatwg.org/#dom-node-lookupprefix - fn LookupPrefix(&self, _prefix: Option<DOMString>) -> Option<DOMString> { + fn LookupPrefix(self, _prefix: Option<DOMString>) -> Option<DOMString> { // FIXME (#1826) implement. None } // http://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri - fn LookupNamespaceURI(&self, _namespace: Option<DOMString>) -> Option<DOMString> { + fn LookupNamespaceURI(self, _namespace: Option<DOMString>) -> Option<DOMString> { // FIXME (#1826) implement. None } // http://dom.spec.whatwg.org/#dom-node-isdefaultnamespace - fn IsDefaultNamespace(&self, _namespace: Option<DOMString>) -> bool { + fn IsDefaultNamespace(self, _namespace: Option<DOMString>) -> bool { // FIXME (#1826) implement. false } diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 0fbc6d47b79..1691a4cbd0f 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -48,7 +48,7 @@ impl NodeList { } impl<'a> NodeListMethods for JSRef<'a, NodeList> { - fn Length(&self) -> u32 { + fn Length(self) -> u32 { match self.list_type { Simple(ref elems) => elems.len() as u32, Children(ref node) => { @@ -58,7 +58,7 @@ impl<'a> NodeListMethods for JSRef<'a, NodeList> { } } - fn Item(&self, index: u32) -> Option<Temporary<Node>> { + fn Item(self, index: u32) -> Option<Temporary<Node>> { match self.list_type { _ if index >= self.Length() => None, Simple(ref elems) => Some(Temporary::new(elems[index as uint].clone())), @@ -70,7 +70,7 @@ impl<'a> NodeListMethods for JSRef<'a, NodeList> { } } - fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Temporary<Node>> { + fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Temporary<Node>> { let item = self.Item(index); *found = item.is_some(); item diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs index 7aafb604a9a..1916e86db4c 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -36,11 +36,11 @@ impl Performance { } impl<'a> PerformanceMethods for JSRef<'a, Performance> { - fn Timing(&self) -> Temporary<PerformanceTiming> { + fn Timing(self) -> Temporary<PerformanceTiming> { Temporary::new(self.timing.clone()) } - fn Now(&self) -> DOMHighResTimeStamp { + fn Now(self) -> DOMHighResTimeStamp { let navStart = self.timing.root().NavigationStartPrecise() as f64; (time::precise_time_s() - navStart) as DOMHighResTimeStamp } diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs index 99ed766073c..299c6eb6b16 100644 --- a/components/script/dom/performancetiming.rs +++ b/components/script/dom/performancetiming.rs @@ -37,7 +37,7 @@ impl PerformanceTiming { } impl<'a> PerformanceTimingMethods for JSRef<'a, PerformanceTiming> { - fn NavigationStart(&self) -> u64 { + fn NavigationStart(self) -> u64 { self.navigationStart } } diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index a22261dbca1..b15bc9c4ef0 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -42,7 +42,7 @@ impl ProcessingInstruction { } impl<'a> ProcessingInstructionMethods for JSRef<'a, ProcessingInstruction> { - fn Target(&self) -> DOMString { + fn Target(self) -> DOMString { self.target.clone() } } diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index 3a775bc6f04..d9012f99efe 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -58,13 +58,13 @@ impl ProgressEvent { } impl<'a> ProgressEventMethods for JSRef<'a, ProgressEvent> { - fn LengthComputable(&self) -> bool { + fn LengthComputable(self) -> bool { self.length_computable } - fn Loaded(&self) -> u64{ + fn Loaded(self) -> u64{ self.loaded } - fn Total(&self) -> u64 { + fn Total(self) -> u64 { self.total } } diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 9c3bfc1cadc..98a33f8ca59 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -39,7 +39,7 @@ impl Range { impl<'a> RangeMethods for JSRef<'a, Range> { /// http://dom.spec.whatwg.org/#dom-range-detach - fn Detach(&self) { + fn Detach(self) { // This method intentionally left blank. } } diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index 464ee905b14..019436d77fb 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -30,11 +30,11 @@ impl Screen { } impl<'a> ScreenMethods for JSRef<'a, Screen> { - fn ColorDepth(&self) -> u32 { + fn ColorDepth(self) -> u32 { 24 } - fn PixelDepth(&self) -> u32 { + fn PixelDepth(self) -> u32 { 24 } } diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 9f3e9de384c..057897807d2 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -26,265 +26,265 @@ pub struct TestBinding { } impl<'a> TestBindingMethods for JSRef<'a, TestBinding> { - fn BooleanAttribute(&self) -> bool { false } - fn SetBooleanAttribute(&self, _: bool) {} - fn ByteAttribute(&self) -> i8 { 0 } - fn SetByteAttribute(&self, _: i8) {} - fn OctetAttribute(&self) -> u8 { 0 } - fn SetOctetAttribute(&self, _: u8) {} - fn ShortAttribute(&self) -> i16 { 0 } - fn SetShortAttribute(&self, _: i16) {} - fn UnsignedShortAttribute(&self) -> u16 { 0 } - fn SetUnsignedShortAttribute(&self, _: u16) {} - fn LongAttribute(&self) -> i32 { 0 } - fn SetLongAttribute(&self, _: i32) {} - fn UnsignedLongAttribute(&self) -> u32 { 0 } - fn SetUnsignedLongAttribute(&self, _: u32) {} - fn LongLongAttribute(&self) -> i64 { 0 } - fn SetLongLongAttribute(&self, _: i64) {} - fn UnsignedLongLongAttribute(&self) -> u64 { 0 } - fn SetUnsignedLongLongAttribute(&self, _: u64) {} - fn FloatAttribute(&self) -> f32 { 0. } - fn SetFloatAttribute(&self, _: f32) {} - fn DoubleAttribute(&self) -> f64 { 0. } - fn SetDoubleAttribute(&self, _: f64) {} - fn StringAttribute(&self) -> DOMString { "".to_string() } - fn SetStringAttribute(&self, _: DOMString) {} - fn ByteStringAttribute(&self) -> ByteString { ByteString::new(vec!()) } - fn SetByteStringAttribute(&self, _: ByteString) {} - fn EnumAttribute(&self) -> TestEnum { _empty } - fn SetEnumAttribute(&self, _: TestEnum) {} - fn InterfaceAttribute(&self) -> Temporary<Blob> { + fn BooleanAttribute(self) -> bool { false } + fn SetBooleanAttribute(self, _: bool) {} + fn ByteAttribute(self) -> i8 { 0 } + fn SetByteAttribute(self, _: i8) {} + fn OctetAttribute(self) -> u8 { 0 } + fn SetOctetAttribute(self, _: u8) {} + fn ShortAttribute(self) -> i16 { 0 } + fn SetShortAttribute(self, _: i16) {} + fn UnsignedShortAttribute(self) -> u16 { 0 } + fn SetUnsignedShortAttribute(self, _: u16) {} + fn LongAttribute(self) -> i32 { 0 } + fn SetLongAttribute(self, _: i32) {} + fn UnsignedLongAttribute(self) -> u32 { 0 } + fn SetUnsignedLongAttribute(self, _: u32) {} + fn LongLongAttribute(self) -> i64 { 0 } + fn SetLongLongAttribute(self, _: i64) {} + fn UnsignedLongLongAttribute(self) -> u64 { 0 } + fn SetUnsignedLongLongAttribute(self, _: u64) {} + fn FloatAttribute(self) -> f32 { 0. } + fn SetFloatAttribute(self, _: f32) {} + fn DoubleAttribute(self) -> f64 { 0. } + fn SetDoubleAttribute(self, _: f64) {} + fn StringAttribute(self) -> DOMString { "".to_string() } + fn SetStringAttribute(self, _: DOMString) {} + fn ByteStringAttribute(self) -> ByteString { ByteString::new(vec!()) } + fn SetByteStringAttribute(self, _: ByteString) {} + fn EnumAttribute(self) -> TestEnum { _empty } + fn SetEnumAttribute(self, _: TestEnum) {} + fn InterfaceAttribute(self) -> Temporary<Blob> { let global = self.global.root(); Blob::new(&global.root_ref()) } - fn SetInterfaceAttribute(&self, _: JSRef<Blob>) {} - fn UnionAttribute(&self) -> HTMLElementOrLong { eLong(0) } - fn SetUnionAttribute(&self, _: HTMLElementOrLong) {} - fn Union2Attribute(&self) -> EventOrString { eString("".to_string()) } - fn SetUnion2Attribute(&self, _: EventOrString) {} - fn AnyAttribute(&self, _: *mut JSContext) -> JSVal { NullValue() } - fn SetAnyAttribute(&self, _: *mut JSContext, _: JSVal) {} + fn SetInterfaceAttribute(self, _: JSRef<Blob>) {} + fn UnionAttribute(self) -> HTMLElementOrLong { eLong(0) } + fn SetUnionAttribute(self, _: HTMLElementOrLong) {} + fn Union2Attribute(self) -> EventOrString { eString("".to_string()) } + fn SetUnion2Attribute(self, _: EventOrString) {} + fn AnyAttribute(self, _: *mut JSContext) -> JSVal { NullValue() } + fn SetAnyAttribute(self, _: *mut JSContext, _: JSVal) {} - fn GetBooleanAttributeNullable(&self) -> Option<bool> { Some(false) } - fn SetBooleanAttributeNullable(&self, _: Option<bool>) {} - fn GetByteAttributeNullable(&self) -> Option<i8> { Some(0) } - fn SetByteAttributeNullable(&self, _: Option<i8>) {} - fn GetOctetAttributeNullable(&self) -> Option<u8> { Some(0) } - fn SetOctetAttributeNullable(&self, _: Option<u8>) {} - fn GetShortAttributeNullable(&self) -> Option<i16> { Some(0) } - fn SetShortAttributeNullable(&self, _: Option<i16>) {} - fn GetUnsignedShortAttributeNullable(&self) -> Option<u16> { Some(0) } - fn SetUnsignedShortAttributeNullable(&self, _: Option<u16>) {} - fn GetLongAttributeNullable(&self) -> Option<i32> { Some(0) } - fn SetLongAttributeNullable(&self, _: Option<i32>) {} - fn GetUnsignedLongAttributeNullable(&self) -> Option<u32> { Some(0) } - fn SetUnsignedLongAttributeNullable(&self, _: Option<u32>) {} - fn GetLongLongAttributeNullable(&self) -> Option<i64> { Some(0) } - fn SetLongLongAttributeNullable(&self, _: Option<i64>) {} - fn GetUnsignedLongLongAttributeNullable(&self) -> Option<u64> { Some(0) } - fn SetUnsignedLongLongAttributeNullable(&self, _: Option<u64>) {} - fn GetFloatAttributeNullable(&self) -> Option<f32> { Some(0.) } - fn SetFloatAttributeNullable(&self, _: Option<f32>) {} - fn GetDoubleAttributeNullable(&self) -> Option<f64> { Some(0.) } - fn SetDoubleAttributeNullable(&self, _: Option<f64>) {} - fn GetByteStringAttributeNullable(&self) -> Option<ByteString> { Some(ByteString::new(vec!())) } - fn SetByteStringAttributeNullable(&self, _: Option<ByteString>) {} - fn GetStringAttributeNullable(&self) -> Option<DOMString> { Some("".to_string()) } - fn SetStringAttributeNullable(&self, _: Option<DOMString>) {} - fn GetEnumAttributeNullable(&self) -> Option<TestEnum> { Some(_empty) } - fn GetInterfaceAttributeNullable(&self) -> Option<Temporary<Blob>> { + fn GetBooleanAttributeNullable(self) -> Option<bool> { Some(false) } + fn SetBooleanAttributeNullable(self, _: Option<bool>) {} + fn GetByteAttributeNullable(self) -> Option<i8> { Some(0) } + fn SetByteAttributeNullable(self, _: Option<i8>) {} + fn GetOctetAttributeNullable(self) -> Option<u8> { Some(0) } + fn SetOctetAttributeNullable(self, _: Option<u8>) {} + fn GetShortAttributeNullable(self) -> Option<i16> { Some(0) } + fn SetShortAttributeNullable(self, _: Option<i16>) {} + fn GetUnsignedShortAttributeNullable(self) -> Option<u16> { Some(0) } + fn SetUnsignedShortAttributeNullable(self, _: Option<u16>) {} + fn GetLongAttributeNullable(self) -> Option<i32> { Some(0) } + fn SetLongAttributeNullable(self, _: Option<i32>) {} + fn GetUnsignedLongAttributeNullable(self) -> Option<u32> { Some(0) } + fn SetUnsignedLongAttributeNullable(self, _: Option<u32>) {} + fn GetLongLongAttributeNullable(self) -> Option<i64> { Some(0) } + fn SetLongLongAttributeNullable(self, _: Option<i64>) {} + fn GetUnsignedLongLongAttributeNullable(self) -> Option<u64> { Some(0) } + fn SetUnsignedLongLongAttributeNullable(self, _: Option<u64>) {} + fn GetFloatAttributeNullable(self) -> Option<f32> { Some(0.) } + fn SetFloatAttributeNullable(self, _: Option<f32>) {} + fn GetDoubleAttributeNullable(self) -> Option<f64> { Some(0.) } + fn SetDoubleAttributeNullable(self, _: Option<f64>) {} + fn GetByteStringAttributeNullable(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } + fn SetByteStringAttributeNullable(self, _: Option<ByteString>) {} + fn GetStringAttributeNullable(self) -> Option<DOMString> { Some("".to_string()) } + fn SetStringAttributeNullable(self, _: Option<DOMString>) {} + fn GetEnumAttributeNullable(self) -> Option<TestEnum> { Some(_empty) } + fn GetInterfaceAttributeNullable(self) -> Option<Temporary<Blob>> { let global = self.global.root(); Some(Blob::new(&global.root_ref())) } - fn SetInterfaceAttributeNullable(&self, _: Option<JSRef<Blob>>) {} - fn GetUnionAttributeNullable(&self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } - fn SetUnionAttributeNullable(&self, _: Option<HTMLElementOrLong>) {} - fn GetUnion2AttributeNullable(&self) -> Option<EventOrString> { Some(eString("".to_string())) } - fn SetUnion2AttributeNullable(&self, _: Option<EventOrString>) {} - fn ReceiveVoid(&self) -> () {} - fn ReceiveBoolean(&self) -> bool { false } - fn ReceiveByte(&self) -> i8 { 0 } - fn ReceiveOctet(&self) -> u8 { 0 } - fn ReceiveShort(&self) -> i16 { 0 } - fn ReceiveUnsignedShort(&self) -> u16 { 0 } - fn ReceiveLong(&self) -> i32 { 0 } - fn ReceiveUnsignedLong(&self) -> u32 { 0 } - fn ReceiveLongLong(&self) -> i64 { 0 } - fn ReceiveUnsignedLongLong(&self) -> u64 { 0 } - fn ReceiveFloat(&self) -> f32 { 0. } - fn ReceiveDouble(&self) -> f64 { 0. } - fn ReceiveString(&self) -> DOMString { "".to_string() } - fn ReceiveByteString(&self) -> ByteString { ByteString::new(vec!()) } - fn ReceiveEnum(&self) -> TestEnum { _empty } - fn ReceiveInterface(&self) -> Temporary<Blob> { + fn SetInterfaceAttributeNullable(self, _: Option<JSRef<Blob>>) {} + fn GetUnionAttributeNullable(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } + fn SetUnionAttributeNullable(self, _: Option<HTMLElementOrLong>) {} + fn GetUnion2AttributeNullable(self) -> Option<EventOrString> { Some(eString("".to_string())) } + fn SetUnion2AttributeNullable(self, _: Option<EventOrString>) {} + fn ReceiveVoid(self) -> () {} + fn ReceiveBoolean(self) -> bool { false } + fn ReceiveByte(self) -> i8 { 0 } + fn ReceiveOctet(self) -> u8 { 0 } + fn ReceiveShort(self) -> i16 { 0 } + fn ReceiveUnsignedShort(self) -> u16 { 0 } + fn ReceiveLong(self) -> i32 { 0 } + fn ReceiveUnsignedLong(self) -> u32 { 0 } + fn ReceiveLongLong(self) -> i64 { 0 } + fn ReceiveUnsignedLongLong(self) -> u64 { 0 } + fn ReceiveFloat(self) -> f32 { 0. } + fn ReceiveDouble(self) -> f64 { 0. } + fn ReceiveString(self) -> DOMString { "".to_string() } + fn ReceiveByteString(self) -> ByteString { ByteString::new(vec!()) } + fn ReceiveEnum(self) -> TestEnum { _empty } + fn ReceiveInterface(self) -> Temporary<Blob> { let global = self.global.root(); Blob::new(&global.root_ref()) } - fn ReceiveAny(&self, _: *mut JSContext) -> JSVal { NullValue() } - fn ReceiveUnion(&self) -> HTMLElementOrLong { eLong(0) } - fn ReceiveUnion2(&self) -> EventOrString { eString("".to_string()) } + fn ReceiveAny(self, _: *mut JSContext) -> JSVal { NullValue() } + fn ReceiveUnion(self) -> HTMLElementOrLong { eLong(0) } + fn ReceiveUnion2(self) -> EventOrString { eString("".to_string()) } - fn ReceiveNullableBoolean(&self) -> Option<bool> { Some(false) } - fn ReceiveNullableByte(&self) -> Option<i8> { Some(0) } - fn ReceiveNullableOctet(&self) -> Option<u8> { Some(0) } - fn ReceiveNullableShort(&self) -> Option<i16> { Some(0) } - fn ReceiveNullableUnsignedShort(&self) -> Option<u16> { Some(0) } - fn ReceiveNullableLong(&self) -> Option<i32> { Some(0) } - fn ReceiveNullableUnsignedLong(&self) -> Option<u32> { Some(0) } - fn ReceiveNullableLongLong(&self) -> Option<i64> { Some(0) } - fn ReceiveNullableUnsignedLongLong(&self) -> Option<u64> { Some(0) } - fn ReceiveNullableFloat(&self) -> Option<f32> { Some(0.) } - fn ReceiveNullableDouble(&self) -> Option<f64> { Some(0.) } - fn ReceiveNullableString(&self) -> Option<DOMString> { Some("".to_string()) } - fn ReceiveNullableByteString(&self) -> Option<ByteString> { Some(ByteString::new(vec!())) } - fn ReceiveNullableEnum(&self) -> Option<TestEnum> { Some(_empty) } - fn ReceiveNullableInterface(&self) -> Option<Temporary<Blob>> { + fn ReceiveNullableBoolean(self) -> Option<bool> { Some(false) } + fn ReceiveNullableByte(self) -> Option<i8> { Some(0) } + fn ReceiveNullableOctet(self) -> Option<u8> { Some(0) } + fn ReceiveNullableShort(self) -> Option<i16> { Some(0) } + fn ReceiveNullableUnsignedShort(self) -> Option<u16> { Some(0) } + fn ReceiveNullableLong(self) -> Option<i32> { Some(0) } + fn ReceiveNullableUnsignedLong(self) -> Option<u32> { Some(0) } + fn ReceiveNullableLongLong(self) -> Option<i64> { Some(0) } + fn ReceiveNullableUnsignedLongLong(self) -> Option<u64> { Some(0) } + fn ReceiveNullableFloat(self) -> Option<f32> { Some(0.) } + fn ReceiveNullableDouble(self) -> Option<f64> { Some(0.) } + fn ReceiveNullableString(self) -> Option<DOMString> { Some("".to_string()) } + fn ReceiveNullableByteString(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } + fn ReceiveNullableEnum(self) -> Option<TestEnum> { Some(_empty) } + fn ReceiveNullableInterface(self) -> Option<Temporary<Blob>> { let global = self.global.root(); Some(Blob::new(&global.root_ref())) } - fn ReceiveNullableUnion(&self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } - fn ReceiveNullableUnion2(&self) -> Option<EventOrString> { Some(eString("".to_string())) } + fn ReceiveNullableUnion(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } + fn ReceiveNullableUnion2(self) -> Option<EventOrString> { Some(eString("".to_string())) } - fn PassBoolean(&self, _: bool) {} - fn PassByte(&self, _: i8) {} - fn PassOctet(&self, _: u8) {} - fn PassShort(&self, _: i16) {} - fn PassUnsignedShort(&self, _: u16) {} - fn PassLong(&self, _: i32) {} - fn PassUnsignedLong(&self, _: u32) {} - fn PassLongLong(&self, _: i64) {} - fn PassUnsignedLongLong(&self, _: u64) {} - fn PassFloat(&self, _: f32) {} - fn PassDouble(&self, _: f64) {} - fn PassString(&self, _: DOMString) {} - fn PassByteString(&self, _: ByteString) {} - fn PassEnum(&self, _: TestEnum) {} - fn PassInterface(&self, _: JSRef<Blob>) {} - fn PassUnion(&self, _: HTMLElementOrLong) {} - fn PassUnion2(&self, _: EventOrString) {} - fn PassUnion3(&self, _: BlobOrString) {} - fn PassAny(&self, _: *mut JSContext, _: JSVal) {} + fn PassBoolean(self, _: bool) {} + fn PassByte(self, _: i8) {} + fn PassOctet(self, _: u8) {} + fn PassShort(self, _: i16) {} + fn PassUnsignedShort(self, _: u16) {} + fn PassLong(self, _: i32) {} + fn PassUnsignedLong(self, _: u32) {} + fn PassLongLong(self, _: i64) {} + fn PassUnsignedLongLong(self, _: u64) {} + fn PassFloat(self, _: f32) {} + fn PassDouble(self, _: f64) {} + fn PassString(self, _: DOMString) {} + fn PassByteString(self, _: ByteString) {} + fn PassEnum(self, _: TestEnum) {} + fn PassInterface(self, _: JSRef<Blob>) {} + fn PassUnion(self, _: HTMLElementOrLong) {} + fn PassUnion2(self, _: EventOrString) {} + fn PassUnion3(self, _: BlobOrString) {} + fn PassAny(self, _: *mut JSContext, _: JSVal) {} - fn PassNullableBoolean(&self, _: Option<bool>) {} - fn PassNullableByte(&self, _: Option<i8>) {} - fn PassNullableOctet(&self, _: Option<u8>) {} - fn PassNullableShort(&self, _: Option<i16>) {} - fn PassNullableUnsignedShort(&self, _: Option<u16>) {} - fn PassNullableLong(&self, _: Option<i32>) {} - fn PassNullableUnsignedLong(&self, _: Option<u32>) {} - fn PassNullableLongLong(&self, _: Option<i64>) {} - fn PassNullableUnsignedLongLong(&self, _: Option<u64>) {} - fn PassNullableFloat(&self, _: Option<f32>) {} - fn PassNullableDouble(&self, _: Option<f64>) {} - fn PassNullableString(&self, _: Option<DOMString>) {} - fn PassNullableByteString(&self, _: Option<ByteString>) {} - // fn PassNullableEnum(&self, _: Option<TestEnum>) {} - fn PassNullableInterface(&self, _: Option<JSRef<Blob>>) {} - fn PassNullableUnion(&self, _: Option<HTMLElementOrLong>) {} - fn PassNullableUnion2(&self, _: Option<EventOrString>) {} + fn PassNullableBoolean(self, _: Option<bool>) {} + fn PassNullableByte(self, _: Option<i8>) {} + fn PassNullableOctet(self, _: Option<u8>) {} + fn PassNullableShort(self, _: Option<i16>) {} + fn PassNullableUnsignedShort(self, _: Option<u16>) {} + fn PassNullableLong(self, _: Option<i32>) {} + fn PassNullableUnsignedLong(self, _: Option<u32>) {} + fn PassNullableLongLong(self, _: Option<i64>) {} + fn PassNullableUnsignedLongLong(self, _: Option<u64>) {} + fn PassNullableFloat(self, _: Option<f32>) {} + fn PassNullableDouble(self, _: Option<f64>) {} + fn PassNullableString(self, _: Option<DOMString>) {} + fn PassNullableByteString(self, _: Option<ByteString>) {} + // fn PassNullableEnum(self, _: Option<TestEnum>) {} + fn PassNullableInterface(self, _: Option<JSRef<Blob>>) {} + fn PassNullableUnion(self, _: Option<HTMLElementOrLong>) {} + fn PassNullableUnion2(self, _: Option<EventOrString>) {} - fn PassOptionalBoolean(&self, _: Option<bool>) {} - fn PassOptionalByte(&self, _: Option<i8>) {} - fn PassOptionalOctet(&self, _: Option<u8>) {} - fn PassOptionalShort(&self, _: Option<i16>) {} - fn PassOptionalUnsignedShort(&self, _: Option<u16>) {} - fn PassOptionalLong(&self, _: Option<i32>) {} - fn PassOptionalUnsignedLong(&self, _: Option<u32>) {} - fn PassOptionalLongLong(&self, _: Option<i64>) {} - fn PassOptionalUnsignedLongLong(&self, _: Option<u64>) {} - fn PassOptionalFloat(&self, _: Option<f32>) {} - fn PassOptionalDouble(&self, _: Option<f64>) {} - fn PassOptionalString(&self, _: Option<DOMString>) {} - fn PassOptionalByteString(&self, _: Option<ByteString>) {} - fn PassOptionalEnum(&self, _: Option<TestEnum>) {} - fn PassOptionalInterface(&self, _: Option<JSRef<Blob>>) {} - fn PassOptionalUnion(&self, _: Option<HTMLElementOrLong>) {} - fn PassOptionalUnion2(&self, _: Option<EventOrString>) {} - fn PassOptionalAny(&self, _: *mut JSContext, _: JSVal) {} + fn PassOptionalBoolean(self, _: Option<bool>) {} + fn PassOptionalByte(self, _: Option<i8>) {} + fn PassOptionalOctet(self, _: Option<u8>) {} + fn PassOptionalShort(self, _: Option<i16>) {} + fn PassOptionalUnsignedShort(self, _: Option<u16>) {} + fn PassOptionalLong(self, _: Option<i32>) {} + fn PassOptionalUnsignedLong(self, _: Option<u32>) {} + fn PassOptionalLongLong(self, _: Option<i64>) {} + fn PassOptionalUnsignedLongLong(self, _: Option<u64>) {} + fn PassOptionalFloat(self, _: Option<f32>) {} + fn PassOptionalDouble(self, _: Option<f64>) {} + fn PassOptionalString(self, _: Option<DOMString>) {} + fn PassOptionalByteString(self, _: Option<ByteString>) {} + fn PassOptionalEnum(self, _: Option<TestEnum>) {} + fn PassOptionalInterface(self, _: Option<JSRef<Blob>>) {} + fn PassOptionalUnion(self, _: Option<HTMLElementOrLong>) {} + fn PassOptionalUnion2(self, _: Option<EventOrString>) {} + fn PassOptionalAny(self, _: *mut JSContext, _: JSVal) {} - fn PassOptionalNullableBoolean(&self, _: Option<Option<bool>>) {} - fn PassOptionalNullableByte(&self, _: Option<Option<i8>>) {} - fn PassOptionalNullableOctet(&self, _: Option<Option<u8>>) {} - fn PassOptionalNullableShort(&self, _: Option<Option<i16>>) {} - fn PassOptionalNullableUnsignedShort(&self, _: Option<Option<u16>>) {} - fn PassOptionalNullableLong(&self, _: Option<Option<i32>>) {} - fn PassOptionalNullableUnsignedLong(&self, _: Option<Option<u32>>) {} - fn PassOptionalNullableLongLong(&self, _: Option<Option<i64>>) {} - fn PassOptionalNullableUnsignedLongLong(&self, _: Option<Option<u64>>) {} - fn PassOptionalNullableFloat(&self, _: Option<Option<f32>>) {} - fn PassOptionalNullableDouble(&self, _: Option<Option<f64>>) {} - fn PassOptionalNullableString(&self, _: Option<Option<DOMString>>) {} - fn PassOptionalNullableByteString(&self, _: Option<Option<ByteString>>) {} - // fn PassOptionalNullableEnum(&self, _: Option<Option<TestEnum>>) {} - fn PassOptionalNullableInterface(&self, _: Option<Option<JSRef<Blob>>>) {} - fn PassOptionalNullableUnion(&self, _: Option<Option<HTMLElementOrLong>>) {} - fn PassOptionalNullableUnion2(&self, _: Option<Option<EventOrString>>) {} + fn PassOptionalNullableBoolean(self, _: Option<Option<bool>>) {} + fn PassOptionalNullableByte(self, _: Option<Option<i8>>) {} + fn PassOptionalNullableOctet(self, _: Option<Option<u8>>) {} + fn PassOptionalNullableShort(self, _: Option<Option<i16>>) {} + fn PassOptionalNullableUnsignedShort(self, _: Option<Option<u16>>) {} + fn PassOptionalNullableLong(self, _: Option<Option<i32>>) {} + fn PassOptionalNullableUnsignedLong(self, _: Option<Option<u32>>) {} + fn PassOptionalNullableLongLong(self, _: Option<Option<i64>>) {} + fn PassOptionalNullableUnsignedLongLong(self, _: Option<Option<u64>>) {} + fn PassOptionalNullableFloat(self, _: Option<Option<f32>>) {} + fn PassOptionalNullableDouble(self, _: Option<Option<f64>>) {} + fn PassOptionalNullableString(self, _: Option<Option<DOMString>>) {} + fn PassOptionalNullableByteString(self, _: Option<Option<ByteString>>) {} + // fn PassOptionalNullableEnum(self, _: Option<Option<TestEnum>>) {} + fn PassOptionalNullableInterface(self, _: Option<Option<JSRef<Blob>>>) {} + fn PassOptionalNullableUnion(self, _: Option<Option<HTMLElementOrLong>>) {} + fn PassOptionalNullableUnion2(self, _: Option<Option<EventOrString>>) {} - fn PassOptionalBooleanWithDefault(&self, _: bool) {} - fn PassOptionalByteWithDefault(&self, _: i8) {} - fn PassOptionalOctetWithDefault(&self, _: u8) {} - fn PassOptionalShortWithDefault(&self, _: i16) {} - fn PassOptionalUnsignedShortWithDefault(&self, _: u16) {} - fn PassOptionalLongWithDefault(&self, _: i32) {} - fn PassOptionalUnsignedLongWithDefault(&self, _: u32) {} - fn PassOptionalLongLongWithDefault(&self, _: i64) {} - fn PassOptionalUnsignedLongLongWithDefault(&self, _: u64) {} - fn PassOptionalStringWithDefault(&self, _: DOMString) {} - fn PassOptionalEnumWithDefault(&self, _: TestEnum) {} + fn PassOptionalBooleanWithDefault(self, _: bool) {} + fn PassOptionalByteWithDefault(self, _: i8) {} + fn PassOptionalOctetWithDefault(self, _: u8) {} + fn PassOptionalShortWithDefault(self, _: i16) {} + fn PassOptionalUnsignedShortWithDefault(self, _: u16) {} + fn PassOptionalLongWithDefault(self, _: i32) {} + fn PassOptionalUnsignedLongWithDefault(self, _: u32) {} + fn PassOptionalLongLongWithDefault(self, _: i64) {} + fn PassOptionalUnsignedLongLongWithDefault(self, _: u64) {} + fn PassOptionalStringWithDefault(self, _: DOMString) {} + fn PassOptionalEnumWithDefault(self, _: TestEnum) {} - fn PassOptionalNullableBooleanWithDefault(&self, _: Option<bool>) {} - fn PassOptionalNullableByteWithDefault(&self, _: Option<i8>) {} - fn PassOptionalNullableOctetWithDefault(&self, _: Option<u8>) {} - fn PassOptionalNullableShortWithDefault(&self, _: Option<i16>) {} - fn PassOptionalNullableUnsignedShortWithDefault(&self, _: Option<u16>) {} - fn PassOptionalNullableLongWithDefault(&self, _: Option<i32>) {} - fn PassOptionalNullableUnsignedLongWithDefault(&self, _: Option<u32>) {} - fn PassOptionalNullableLongLongWithDefault(&self, _: Option<i64>) {} - fn PassOptionalNullableUnsignedLongLongWithDefault(&self, _: Option<u64>) {} - // fn PassOptionalNullableFloatWithDefault(&self, _: Option<f32>) {} - // fn PassOptionalNullableDoubleWithDefault(&self, _: Option<f64>) {} - fn PassOptionalNullableStringWithDefault(&self, _: Option<DOMString>) {} - fn PassOptionalNullableByteStringWithDefault(&self, _: Option<ByteString>) {} - // fn PassOptionalNullableEnumWithDefault(&self, _: Option<TestEnum>) {} - fn PassOptionalNullableInterfaceWithDefault(&self, _: Option<JSRef<Blob>>) {} - fn PassOptionalNullableUnionWithDefault(&self, _: Option<HTMLElementOrLong>) {} - fn PassOptionalNullableUnion2WithDefault(&self, _: Option<EventOrString>) {} - fn PassOptionalAnyWithDefault(&self, _: *mut JSContext, _: JSVal) {} + fn PassOptionalNullableBooleanWithDefault(self, _: Option<bool>) {} + fn PassOptionalNullableByteWithDefault(self, _: Option<i8>) {} + fn PassOptionalNullableOctetWithDefault(self, _: Option<u8>) {} + fn PassOptionalNullableShortWithDefault(self, _: Option<i16>) {} + fn PassOptionalNullableUnsignedShortWithDefault(self, _: Option<u16>) {} + fn PassOptionalNullableLongWithDefault(self, _: Option<i32>) {} + fn PassOptionalNullableUnsignedLongWithDefault(self, _: Option<u32>) {} + fn PassOptionalNullableLongLongWithDefault(self, _: Option<i64>) {} + fn PassOptionalNullableUnsignedLongLongWithDefault(self, _: Option<u64>) {} + // fn PassOptionalNullableFloatWithDefault(self, _: Option<f32>) {} + // fn PassOptionalNullableDoubleWithDefault(self, _: Option<f64>) {} + fn PassOptionalNullableStringWithDefault(self, _: Option<DOMString>) {} + fn PassOptionalNullableByteStringWithDefault(self, _: Option<ByteString>) {} + // fn PassOptionalNullableEnumWithDefault(self, _: Option<TestEnum>) {} + fn PassOptionalNullableInterfaceWithDefault(self, _: Option<JSRef<Blob>>) {} + fn PassOptionalNullableUnionWithDefault(self, _: Option<HTMLElementOrLong>) {} + fn PassOptionalNullableUnion2WithDefault(self, _: Option<EventOrString>) {} + fn PassOptionalAnyWithDefault(self, _: *mut JSContext, _: JSVal) {} - fn PassOptionalNullableBooleanWithNonNullDefault(&self, _: Option<bool>) {} - fn PassOptionalNullableByteWithNonNullDefault(&self, _: Option<i8>) {} - fn PassOptionalNullableOctetWithNonNullDefault(&self, _: Option<u8>) {} - fn PassOptionalNullableShortWithNonNullDefault(&self, _: Option<i16>) {} - fn PassOptionalNullableUnsignedShortWithNonNullDefault(&self, _: Option<u16>) {} - fn PassOptionalNullableLongWithNonNullDefault(&self, _: Option<i32>) {} - fn PassOptionalNullableUnsignedLongWithNonNullDefault(&self, _: Option<u32>) {} - fn PassOptionalNullableLongLongWithNonNullDefault(&self, _: Option<i64>) {} - fn PassOptionalNullableUnsignedLongLongWithNonNullDefault(&self, _: Option<u64>) {} - // fn PassOptionalNullableFloatWithNonNullDefault(&self, _: Option<f32>) {} - // fn PassOptionalNullableDoubleWithNonNullDefault(&self, _: Option<f64>) {} - fn PassOptionalNullableStringWithNonNullDefault(&self, _: Option<DOMString>) {} - // fn PassOptionalNullableEnumWithNonNullDefault(&self, _: Option<TestEnum>) {} + fn PassOptionalNullableBooleanWithNonNullDefault(self, _: Option<bool>) {} + fn PassOptionalNullableByteWithNonNullDefault(self, _: Option<i8>) {} + fn PassOptionalNullableOctetWithNonNullDefault(self, _: Option<u8>) {} + fn PassOptionalNullableShortWithNonNullDefault(self, _: Option<i16>) {} + fn PassOptionalNullableUnsignedShortWithNonNullDefault(self, _: Option<u16>) {} + fn PassOptionalNullableLongWithNonNullDefault(self, _: Option<i32>) {} + fn PassOptionalNullableUnsignedLongWithNonNullDefault(self, _: Option<u32>) {} + fn PassOptionalNullableLongLongWithNonNullDefault(self, _: Option<i64>) {} + fn PassOptionalNullableUnsignedLongLongWithNonNullDefault(self, _: Option<u64>) {} + // fn PassOptionalNullableFloatWithNonNullDefault(self, _: Option<f32>) {} + // fn PassOptionalNullableDoubleWithNonNullDefault(self, _: Option<f64>) {} + fn PassOptionalNullableStringWithNonNullDefault(self, _: Option<DOMString>) {} + // fn PassOptionalNullableEnumWithNonNullDefault(self, _: Option<TestEnum>) {} - fn PassVariadicBoolean(&self, _: Vec<bool>) {} - fn PassVariadicByte(&self, _: Vec<i8>) {} - fn PassVariadicOctet(&self, _: Vec<u8>) {} - fn PassVariadicShort(&self, _: Vec<i16>) {} - fn PassVariadicUnsignedShort(&self, _: Vec<u16>) {} - fn PassVariadicLong(&self, _: Vec<i32>) {} - fn PassVariadicUnsignedLong(&self, _: Vec<u32>) {} - fn PassVariadicLongLong(&self, _: Vec<i64>) {} - fn PassVariadicUnsignedLongLong(&self, _: Vec<u64>) {} - fn PassVariadicFloat(&self, _: Vec<f32>) {} - fn PassVariadicDouble(&self, _: Vec<f64>) {} - fn PassVariadicString(&self, _: Vec<DOMString>) {} - fn PassVariadicByteString(&self, _: Vec<ByteString>) {} - fn PassVariadicEnum(&self, _: Vec<TestEnum>) {} - // fn PassVariadicInterface(&self, _: Vec<JSRef<Blob>>) {} - fn PassVariadicUnion(&self, _: Vec<HTMLElementOrLong>) {} - fn PassVariadicUnion2(&self, _: Vec<EventOrString>) {} - fn PassVariadicUnion3(&self, _: Vec<BlobOrString>) {} - fn PassVariadicAny(&self, _: *mut JSContext, _: Vec<JSVal>) {} + fn PassVariadicBoolean(self, _: Vec<bool>) {} + fn PassVariadicByte(self, _: Vec<i8>) {} + fn PassVariadicOctet(self, _: Vec<u8>) {} + fn PassVariadicShort(self, _: Vec<i16>) {} + fn PassVariadicUnsignedShort(self, _: Vec<u16>) {} + fn PassVariadicLong(self, _: Vec<i32>) {} + fn PassVariadicUnsignedLong(self, _: Vec<u32>) {} + fn PassVariadicLongLong(self, _: Vec<i64>) {} + fn PassVariadicUnsignedLongLong(self, _: Vec<u64>) {} + fn PassVariadicFloat(self, _: Vec<f32>) {} + fn PassVariadicDouble(self, _: Vec<f64>) {} + fn PassVariadicString(self, _: Vec<DOMString>) {} + fn PassVariadicByteString(self, _: Vec<ByteString>) {} + fn PassVariadicEnum(self, _: Vec<TestEnum>) {} + // fn PassVariadicInterface(self, _: Vec<JSRef<Blob>>) {} + fn PassVariadicUnion(self, _: Vec<HTMLElementOrLong>) {} + fn PassVariadicUnion2(self, _: Vec<EventOrString>) {} + fn PassVariadicUnion3(self, _: Vec<BlobOrString>) {} + fn PassVariadicAny(self, _: *mut JSContext, _: Vec<JSVal>) {} } impl TestBinding { diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index aa09af45c7c..e1d49be408f 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -69,15 +69,15 @@ impl TreeWalker { } impl<'a> TreeWalkerMethods for JSRef<'a, TreeWalker> { - fn Root(&self) -> Temporary<Node> { + fn Root(self) -> Temporary<Node> { Temporary::new(self.root_node) } - fn WhatToShow(&self) -> u32 { + fn WhatToShow(self) -> u32 { self.what_to_show } - fn GetFilter(&self) -> Option<NodeFilter> { + fn GetFilter(self) -> Option<NodeFilter> { match self.filter { FilterNone => None, FilterJS(nf) => Some(nf), @@ -85,41 +85,41 @@ impl<'a> TreeWalkerMethods for JSRef<'a, TreeWalker> { } } - fn CurrentNode(&self) -> Temporary<Node> { + fn CurrentNode(self) -> Temporary<Node> { Temporary::new(self.current_node.get()) } - fn SetCurrentNode(&self, node: JSRef<Node>) -> ErrorResult { + fn SetCurrentNode(self, node: JSRef<Node>) -> ErrorResult { // XXX Future: check_same_origin(root_node, node) (throws) self.current_node.set(JS::from_rooted(node)); Ok(()) } - fn ParentNode(&self) -> Fallible<Option<Temporary<Node>>> { + fn ParentNode(self) -> Fallible<Option<Temporary<Node>>> { self.parent_node() } - fn FirstChild(&self) -> Fallible<Option<Temporary<Node>>> { + fn FirstChild(self) -> Fallible<Option<Temporary<Node>>> { self.first_child() } - fn LastChild(&self) -> Fallible<Option<Temporary<Node>>> { + fn LastChild(self) -> Fallible<Option<Temporary<Node>>> { self.last_child() } - fn PreviousSibling(&self) -> Fallible<Option<Temporary<Node>>> { + fn PreviousSibling(self) -> Fallible<Option<Temporary<Node>>> { self.prev_sibling() } - fn NextSibling(&self) -> Fallible<Option<Temporary<Node>>> { + fn NextSibling(self) -> Fallible<Option<Temporary<Node>>> { self.next_sibling() } - fn PreviousNode(&self) -> Fallible<Option<Temporary<Node>>> { + fn PreviousNode(self) -> Fallible<Option<Temporary<Node>>> { self.prev_node() } - fn NextNode(&self) -> Fallible<Option<Temporary<Node>>> { + fn NextNode(self) -> Fallible<Option<Temporary<Node>>> { self.next_node() } } diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index f8f7b59094d..6d51347e000 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -68,21 +68,21 @@ impl UIEvent { } impl<'a> UIEventMethods for JSRef<'a, UIEvent> { - fn GetView(&self) -> Option<Temporary<Window>> { + fn GetView(self) -> Option<Temporary<Window>> { self.view.get().map(|view| Temporary::new(view)) } - fn Detail(&self) -> i32 { + fn Detail(self) -> i32 { self.detail.deref().get() } - fn InitUIEvent(&self, + fn InitUIEvent(self, type_: DOMString, can_bubble: bool, cancelable: bool, view: Option<JSRef<Window>>, detail: i32) { - let event: JSRef<Event> = EventCast::from_ref(*self); + let event: JSRef<Event> = EventCast::from_ref(self); event.InitEvent(type_, can_bubble, cancelable); self.view.assign(view); self.detail.deref().set(detail); diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index 7ac6067862e..ea8d7da7002 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -61,26 +61,26 @@ impl URLSearchParams { } impl<'a> URLSearchParamsMethods for JSRef<'a, URLSearchParams> { - fn Append(&self, name: DOMString, value: DOMString) { + fn Append(self, name: DOMString, value: DOMString) { self.data.deref().borrow_mut().insert_or_update_with(name, vec!(value.clone()), |_k, v| v.push(value.clone())); self.update_steps(); } - fn Delete(&self, name: DOMString) { + fn Delete(self, name: DOMString) { self.data.deref().borrow_mut().remove(&name); self.update_steps(); } - fn Get(&self, name: DOMString) -> Option<DOMString> { + fn Get(self, name: DOMString) -> Option<DOMString> { self.data.deref().borrow().find_equiv(&name).map(|v| v[0].clone()) } - fn Has(&self, name: DOMString) -> bool { + fn Has(self, name: DOMString) -> bool { self.data.deref().borrow().contains_key_equiv(&name) } - fn Set(&self, name: DOMString, value: DOMString) { + fn Set(self, name: DOMString, value: DOMString) { self.data.deref().borrow_mut().insert(name, vec!(value)); self.update_steps(); } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 3c3f79d3da3..fd147aaefdf 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -202,51 +202,51 @@ pub fn base64_atob(atob: DOMString) -> Fallible<DOMString> { impl<'a> WindowMethods for JSRef<'a, Window> { - fn Alert(&self, s: DOMString) { + fn Alert(self, s: DOMString) { // Right now, just print to the console println!("ALERT: {:s}", s); } - fn Close(&self) { + fn Close(self) { let ScriptChan(ref chan) = self.script_chan; chan.send(ExitWindowMsg(self.page.id.clone())); } - fn Document(&self) -> Temporary<Document> { + fn Document(self) -> Temporary<Document> { let frame = self.page().frame(); Temporary::new(frame.get_ref().document.clone()) } - fn Location(&self) -> Temporary<Location> { + fn Location(self) -> Temporary<Location> { if self.location.get().is_none() { let page = self.deref().page.clone(); - let location = Location::new(*self, page); + let location = Location::new(self, page); self.location.assign(Some(location)); } Temporary::new(self.location.get().get_ref().clone()) } - fn Console(&self) -> Temporary<Console> { + fn Console(self) -> Temporary<Console> { if self.console.get().is_none() { - let console = Console::new(&global::Window(*self)); + let console = Console::new(&global::Window(self)); self.console.assign(Some(console)); } Temporary::new(self.console.get().get_ref().clone()) } - fn Navigator(&self) -> Temporary<Navigator> { + fn Navigator(self) -> Temporary<Navigator> { if self.navigator.get().is_none() { - let navigator = Navigator::new(*self); + let navigator = Navigator::new(self); self.navigator.assign(Some(navigator)); } Temporary::new(self.navigator.get().get_ref().clone()) } - fn SetTimeout(&self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 { + fn SetTimeout(self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 { self.set_timeout_or_interval(callback, timeout, false) } - fn ClearTimeout(&self, handle: i32) { + fn ClearTimeout(self, handle: i32) { let mut timers = self.active_timers.deref().borrow_mut(); let mut timer_handle = timers.pop(&TimerId(handle)); match timer_handle { @@ -256,103 +256,103 @@ impl<'a> WindowMethods for JSRef<'a, Window> { timers.remove(&TimerId(handle)); } - fn SetInterval(&self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 { + fn SetInterval(self, _cx: *mut JSContext, callback: JSVal, timeout: i32) -> i32 { self.set_timeout_or_interval(callback, timeout, true) } - fn ClearInterval(&self, handle: i32) { + fn ClearInterval(self, handle: i32) { self.ClearTimeout(handle); } - fn Window(&self) -> Temporary<Window> { - Temporary::from_rooted(*self) + fn Window(self) -> Temporary<Window> { + Temporary::from_rooted(self) } - fn Self(&self) -> Temporary<Window> { + fn Self(self) -> Temporary<Window> { self.Window() } // http://www.whatwg.org/html/#dom-frames - fn Frames(&self) -> Temporary<Window> { + fn Frames(self) -> Temporary<Window> { self.Window() } - fn Parent(&self) -> Temporary<Window> { + fn Parent(self) -> Temporary<Window> { //TODO - Once we support iframes correctly this needs to return the parent frame self.Window() } - fn Performance(&self) -> Temporary<Performance> { + fn Performance(self) -> Temporary<Performance> { if self.performance.get().is_none() { - let performance = Performance::new(*self); + let performance = Performance::new(self); self.performance.assign(Some(performance)); } Temporary::new(self.performance.get().get_ref().clone()) } - fn GetOnclick(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnclick(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("click") } - fn SetOnclick(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnclick(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("click", listener) } - fn GetOnload(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnload(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("load") } - fn SetOnload(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnload(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("load", listener) } - fn GetOnunload(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnunload(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("unload") } - fn SetOnunload(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnunload(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("unload", listener) } - fn GetOnerror(&self) -> Option<OnErrorEventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnerror(self) -> Option<OnErrorEventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("error") } - fn SetOnerror(&self, listener: Option<OnErrorEventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnerror(self, listener: Option<OnErrorEventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("error", listener) } - fn Screen(&self) -> Temporary<Screen> { + fn Screen(self) -> Temporary<Screen> { if self.screen.get().is_none() { - let screen = Screen::new(*self); + let screen = Screen::new(self); self.screen.assign(Some(screen)); } Temporary::new(self.screen.get().get_ref().clone()) } - fn Debug(&self, message: DOMString) { + fn Debug(self, message: DOMString) { debug!("{:s}", message); } - fn Gc(&self) { + fn Gc(self) { unsafe { JS_GC(JS_GetRuntime(self.get_cx())); } } - fn Btoa(&self, btoa: DOMString) -> Fallible<DOMString> { + fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> { base64_btoa(btoa) } - fn Atob(&self, atob: DOMString) -> Fallible<DOMString> { + fn Atob(self, atob: DOMString) -> Fallible<DOMString> { base64_atob(atob) } } diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index be7a8ffb34d..af7302a1671 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -130,7 +130,7 @@ impl Worker { } impl<'a> WorkerMethods for JSRef<'a, Worker> { - fn PostMessage(&self, cx: *mut JSContext, message: JSVal) { + fn PostMessage(self, cx: *mut JSContext, message: JSVal) { let mut data = ptr::mut_null(); let mut nbytes = 0; unsafe { @@ -143,13 +143,13 @@ impl<'a> WorkerMethods for JSRef<'a, Worker> { sender.send(DOMMessage(data, nbytes)); } - fn GetOnmessage(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnmessage(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("message") } - fn SetOnmessage(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnmessage(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("message", listener) } } diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index b4aa3603ef4..b0df64f0b11 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -79,19 +79,19 @@ impl WorkerGlobalScope { } impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> { - fn Self(&self) -> Temporary<WorkerGlobalScope> { - Temporary::from_rooted(*self) + fn Self(self) -> Temporary<WorkerGlobalScope> { + Temporary::from_rooted(self) } - fn Location(&self) -> Temporary<WorkerLocation> { + fn Location(self) -> Temporary<WorkerLocation> { if self.location.get().is_none() { - let location = WorkerLocation::new(*self, self.worker_url.deref().clone()); + let location = WorkerLocation::new(self, self.worker_url.deref().clone()); self.location.assign(Some(location)); } Temporary::new(self.location.get().get_ref().clone()) } - fn ImportScripts(&self, url_strings: Vec<DOMString>) -> ErrorResult { + fn ImportScripts(self, url_strings: Vec<DOMString>) -> ErrorResult { let mut urls = Vec::with_capacity(url_strings.len()); for url in url_strings.move_iter() { let url = UrlParser::new().base_url(&*self.worker_url) @@ -123,27 +123,27 @@ impl<'a> WorkerGlobalScopeMethods for JSRef<'a, WorkerGlobalScope> { Ok(()) } - fn Navigator(&self) -> Temporary<WorkerNavigator> { + fn Navigator(self) -> Temporary<WorkerNavigator> { if self.navigator.get().is_none() { - let navigator = WorkerNavigator::new(*self); + let navigator = WorkerNavigator::new(self); self.navigator.assign(Some(navigator)); } Temporary::new(self.navigator.get().get_ref().clone()) } - fn Console(&self) -> Temporary<Console> { + fn Console(self) -> Temporary<Console> { if self.console.get().is_none() { - let console = Console::new(&global::Worker(*self)); + let console = Console::new(&global::Worker(self)); self.console.assign(Some(console)); } Temporary::new(self.console.get().get_ref().clone()) } - fn Btoa(&self, btoa: DOMString) -> Fallible<DOMString> { + fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> { base64_btoa(btoa) } - fn Atob(&self, atob: DOMString) -> Fallible<DOMString> { + fn Atob(self, atob: DOMString) -> Fallible<DOMString> { base64_atob(atob) } } diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index f8732a0f7ac..57334953e3d 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -38,15 +38,15 @@ impl WorkerLocation { } impl<'a> WorkerLocationMethods for JSRef<'a, WorkerLocation> { - fn Href(&self) -> DOMString { + fn Href(self) -> DOMString { UrlHelper::Href(self.url.deref()) } - fn Search(&self) -> DOMString { + fn Search(self) -> DOMString { UrlHelper::Search(self.url.deref()) } - fn Hash(&self) -> DOMString { + fn Hash(self) -> DOMString { UrlHelper::Hash(self.url.deref()) } } diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index 37de1b91e65..e99e93991b1 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -32,23 +32,23 @@ impl WorkerNavigator { } impl<'a> WorkerNavigatorMethods for JSRef<'a, WorkerNavigator> { - fn Product(&self) -> DOMString { + fn Product(self) -> DOMString { NavigatorInfo::Product() } - fn TaintEnabled(&self) -> bool { + fn TaintEnabled(self) -> bool { NavigatorInfo::TaintEnabled() } - fn AppName(&self) -> DOMString { + fn AppName(self) -> DOMString { NavigatorInfo::AppName() } - fn AppCodeName(&self) -> DOMString { + fn AppCodeName(self) -> DOMString { NavigatorInfo::AppCodeName() } - fn Platform(&self) -> DOMString { + fn Platform(self) -> DOMString { NavigatorInfo::Platform() } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 3f3be18a4ed..3afbe1ecb72 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -91,8 +91,8 @@ pub enum XHRProgress { TimeoutMsg } -enum SyncOrAsync<'a, 'b> { - Sync(&'b JSRef<'a, XMLHttpRequest>), +enum SyncOrAsync<'a> { + Sync(JSRef<'a, XMLHttpRequest>), Async(TrustedXHRAddress, ScriptChan) } @@ -186,7 +186,7 @@ impl XMLHttpRequest { cors_request: Result<Option<CORSRequest>,()>) -> ErrorResult { fn notify_partial_progress(fetch_type: &SyncOrAsync, msg: XHRProgress) { match *fetch_type { - Sync(ref xhr) => { + Sync(xhr) => { xhr.process_partial_response(msg); }, Async(addr, ref script_chan) => { @@ -259,21 +259,21 @@ impl XMLHttpRequest { } impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { - fn GetOnreadystatechange(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnreadystatechange(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("readystatechange") } - fn SetOnreadystatechange(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnreadystatechange(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("readystatechange", listener) } - fn ReadyState(&self) -> u16 { + fn ReadyState(self) -> u16 { self.ready_state.deref().get() as u16 } - fn Open(&self, method: ByteString, url: DOMString) -> ErrorResult { + fn Open(self, method: ByteString, url: DOMString) -> ErrorResult { // Clean up from previous requests, if any: self.cancel_timeout(); let uppercase_method = method.as_str().map(|s| { @@ -334,12 +334,12 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { _ => Err(Syntax), // Step 3 } } - fn Open_(&self, method: ByteString, url: DOMString, async: bool, + fn Open_(self, method: ByteString, url: DOMString, async: bool, _username: Option<DOMString>, _password: Option<DOMString>) -> ErrorResult { self.sync.deref().set(!async); self.Open(method, url) } - fn SetRequestHeader(&self, name: ByteString, mut value: ByteString) -> ErrorResult { + fn SetRequestHeader(self, name: ByteString, mut value: ByteString) -> ErrorResult { if self.ready_state.deref().get() != Opened || self.send_flag.deref().get() { return Err(InvalidState); // Step 1, 2 } @@ -403,10 +403,10 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { None => Err(Syntax) } } - fn Timeout(&self) -> u32 { + fn Timeout(self) -> u32 { self.timeout.deref().get() } - fn SetTimeout(&self, timeout: u32) -> ErrorResult { + fn SetTimeout(self, timeout: u32) -> ErrorResult { if self.sync.deref().get() { // FIXME: Not valid for a worker environment Err(InvalidState) @@ -428,16 +428,16 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { Ok(()) } } - fn WithCredentials(&self) -> bool { + fn WithCredentials(self) -> bool { self.with_credentials.deref().get() } - fn SetWithCredentials(&self, with_credentials: bool) { + fn SetWithCredentials(self, with_credentials: bool) { self.with_credentials.deref().set(with_credentials); } - fn Upload(&self) -> Temporary<XMLHttpRequestUpload> { + fn Upload(self) -> Temporary<XMLHttpRequestUpload> { Temporary::new(self.upload) } - fn Send(&self, data: Option<SendParam>) -> ErrorResult { + fn Send(self, data: Option<SendParam>) -> ErrorResult { if self.ready_state.deref().get() != Opened || self.send_flag.deref().get() { return Err(InvalidState); // Step 1, 2 } @@ -566,7 +566,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { } Ok(()) } - fn Abort(&self) { + fn Abort(self) { self.terminate_sender.deref().borrow().as_ref().map(|s| s.send_opt(Abort)); match self.ready_state.deref().get() { Opened if self.send_flag.deref().get() => self.process_partial_response(ErroredMsg(Some(Abort))), @@ -575,16 +575,16 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { }; self.ready_state.deref().set(Unsent); } - fn ResponseURL(&self) -> DOMString { + fn ResponseURL(self) -> DOMString { self.response_url.clone() } - fn Status(&self) -> u16 { + fn Status(self) -> u16 { self.status.deref().get() } - fn StatusText(&self) -> ByteString { + fn StatusText(self) -> ByteString { self.status_text.deref().borrow().clone() } - fn GetResponseHeader(&self, name: ByteString) -> Option<ByteString> { + fn GetResponseHeader(self, name: ByteString) -> Option<ByteString> { self.filter_response_headers().iter().find(|h| { name.eq_ignore_case(&FromStr::from_str(h.header_name().as_slice()).unwrap()) }).map(|h| { @@ -592,7 +592,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { ByteString::new(h.header_value().as_slice().chars().map(|c| { assert!(c <= '\u00FF'); c as u8 }).collect()) }) } - fn GetAllResponseHeaders(&self) -> ByteString { + fn GetAllResponseHeaders(self) -> ByteString { let mut writer = MemWriter::new(); self.filter_response_headers().write_all(&mut writer).ok().expect("Writing response headers failed"); let mut vec = writer.unwrap(); @@ -603,10 +603,10 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { ByteString::new(vec) } - fn ResponseType(&self) -> XMLHttpRequestResponseType { + fn ResponseType(self) -> XMLHttpRequestResponseType { self.response_type.deref().get() } - fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult { + fn SetResponseType(self, response_type: XMLHttpRequestResponseType) -> ErrorResult { match self.global { WorkerField(_) if response_type == Document => return Ok(()), _ => {} @@ -620,7 +620,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { } } } - fn Response(&self, cx: *mut JSContext) -> JSVal { + fn Response(self, cx: *mut JSContext) -> JSVal { match self.response_type.deref().get() { _empty | Text => { let ready_state = self.ready_state.deref().get(); @@ -649,7 +649,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { } } } - fn GetResponseText(&self) -> Fallible<DOMString> { + fn GetResponseText(self) -> Fallible<DOMString> { match self.response_type.deref().get() { _empty | Text => { match self.ready_state.deref().get() { @@ -660,7 +660,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { _ => Err(InvalidState) } } - fn GetResponseXML(&self) -> Option<Temporary<Document>> { + fn GetResponseXML(self) -> Option<Temporary<Document>> { self.response_xml.get().map(|response| Temporary::new(response)) } } diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs index 805cceebc96..66fdf2d77f0 100644 --- a/components/script/dom/xmlhttprequesteventtarget.rs +++ b/components/script/dom/xmlhttprequesteventtarget.rs @@ -41,73 +41,73 @@ impl Reflectable for XMLHttpRequestEventTarget { } impl<'a> XMLHttpRequestEventTargetMethods for JSRef<'a, XMLHttpRequestEventTarget> { - fn GetOnloadstart(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnloadstart(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("loadstart") } - fn SetOnloadstart(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnloadstart(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("loadstart", listener) } - fn GetOnprogress(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnprogress(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("progress") } - fn SetOnprogress(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnprogress(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("progress", listener) } - fn GetOnabort(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnabort(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("abort") } - fn SetOnabort(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnabort(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("abort", listener) } - fn GetOnerror(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnerror(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("error") } - fn SetOnerror(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnerror(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("error", listener) } - fn GetOnload(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnload(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("load") } - fn SetOnload(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnload(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("load", listener) } - fn GetOntimeout(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOntimeout(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("timeout") } - fn SetOntimeout(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOntimeout(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("timeout", listener) } - fn GetOnloadend(&self) -> Option<EventHandlerNonNull> { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn GetOnloadend(self) -> Option<EventHandlerNonNull> { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common("loadend") } - fn SetOnloadend(&self, listener: Option<EventHandlerNonNull>) { - let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); + fn SetOnloadend(self, listener: Option<EventHandlerNonNull>) { + let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common("loadend", listener) } } |