diff options
Diffstat (limited to 'components/script/dom')
99 files changed, 1192 insertions, 1192 deletions
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 29648286c2c..e1baff2bffd 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -162,19 +162,19 @@ impl Attr { } } -impl<'a> AttrMethods for &'a Attr { +impl AttrMethods for Attr { // https://dom.spec.whatwg.org/#dom-attr-localname - fn LocalName(self) -> DOMString { + fn LocalName(&self) -> DOMString { (**self.local_name()).to_owned() } // https://dom.spec.whatwg.org/#dom-attr-value - fn Value(self) -> DOMString { + fn Value(&self) -> DOMString { (**self.value()).to_owned() } // https://dom.spec.whatwg.org/#dom-attr-value - fn SetValue(self, value: DOMString) { + fn SetValue(&self, value: DOMString) { match self.owner() { None => *self.value.borrow_mut() = AttrValue::String(value), Some(owner) => { @@ -185,32 +185,32 @@ impl<'a> AttrMethods for &'a Attr { } // https://dom.spec.whatwg.org/#dom-attr-textcontent - fn TextContent(self) -> DOMString { + fn TextContent(&self) -> DOMString { self.Value() } // https://dom.spec.whatwg.org/#dom-attr-textcontent - fn SetTextContent(self, value: DOMString) { + fn SetTextContent(&self, value: DOMString) { self.SetValue(value) } // https://dom.spec.whatwg.org/#dom-attr-nodevalue - fn NodeValue(self) -> DOMString { + fn NodeValue(&self) -> DOMString { self.Value() } // https://dom.spec.whatwg.org/#dom-attr-nodevalue - fn SetNodeValue(self, value: DOMString) { + fn SetNodeValue(&self, value: DOMString) { self.SetValue(value) } // https://dom.spec.whatwg.org/#dom-attr-name - fn Name(self) -> DOMString { + fn Name(&self) -> DOMString { (*self.name).to_owned() } // https://dom.spec.whatwg.org/#dom-attr-namespaceuri - fn GetNamespaceURI(self) -> Option<DOMString> { + fn GetNamespaceURI(&self) -> Option<DOMString> { let Namespace(ref atom) = self.namespace; match &**atom { "" => None, @@ -219,17 +219,17 @@ impl<'a> AttrMethods for &'a Attr { } // https://dom.spec.whatwg.org/#dom-attr-prefix - fn GetPrefix(self) -> Option<DOMString> { + fn GetPrefix(&self) -> Option<DOMString> { self.prefix().as_ref().map(|p| (**p).to_owned()) } // https://dom.spec.whatwg.org/#dom-attr-ownerelement - fn GetOwnerElement(self) -> Option<Root<Element>> { + fn GetOwnerElement(&self) -> Option<Root<Element>> { self.owner() } // https://dom.spec.whatwg.org/#dom-attr-specified - fn Specified(self) -> bool { + fn Specified(&self) -> bool { true // Always returns true } } diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 40c31ac09ef..63f9d010729 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4571,7 +4571,7 @@ class CGInterfaceTrait(CGThing): return "".join(", %s: %s" % argument for argument in arguments) methods = [ - 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() ] if methods: diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 4c3cda4715e..23b9965a9f6 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -86,9 +86,9 @@ impl Blob { } } -impl<'a> BlobMethods for &'a Blob { +impl BlobMethods for Blob { // https://dev.w3.org/2006/webapi/FileAPI/#dfn-size - fn Size(self) -> u64 { + fn Size(&self) -> u64 { match self.bytes { None => 0, Some(ref bytes) => bytes.len() as u64 @@ -96,12 +96,12 @@ impl<'a> BlobMethods for &'a Blob { } // https://dev.w3.org/2006/webapi/FileAPI/#dfn-type - fn Type(self) -> DOMString { + fn Type(&self) -> DOMString { self.typeString.clone() } // https://dev.w3.org/2006/webapi/FileAPI/#slice-method-algo - fn Slice(self, start: Option<i64>, end: Option<i64>, + fn Slice(&self, start: Option<i64>, end: Option<i64>, contentType: Option<DOMString>) -> Root<Blob> { let size: i64 = self.Size().to_i64().unwrap(); let relativeStart: i64 = match start { @@ -149,12 +149,12 @@ impl<'a> BlobMethods for &'a Blob { } // https://dev.w3.org/2006/webapi/FileAPI/#dfn-isClosed - fn IsClosed(self) -> bool { + fn IsClosed(&self) -> bool { self.isClosed_.get() } // https://dev.w3.org/2006/webapi/FileAPI/#dfn-close - fn Close(self) { + fn Close(&self) { // Step 1 if self.isClosed_.get() { return; diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs index 2753e75b23d..527b881778d 100644 --- a/components/script/dom/canvasgradient.rs +++ b/components/script/dom/canvasgradient.rs @@ -43,9 +43,9 @@ impl CanvasGradient { } } -impl<'a> CanvasGradientMethods for &'a CanvasGradient { +impl CanvasGradientMethods for CanvasGradient { // https://html.spec.whatwg.org/multipage/#dom-canvasgradient-addcolorstop - fn AddColorStop(self, offset: Finite<f64>, color: String) -> ErrorResult { + fn AddColorStop(&self, offset: Finite<f64>, color: String) -> ErrorResult { if *offset < 0f64 || *offset > 1f64 { return Err(IndexSize); } diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 1f8bb91a55c..31be04ad628 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -446,20 +446,20 @@ impl LayoutCanvasRenderingContext2DHelpers for LayoutJS<CanvasRenderingContext2D // Restricted values are guarded in glue code. Therefore we need not add a guard. // // FIXME: this behavior should might be generated by some annotattions to idl. -impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { +impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas - fn Canvas(self) -> Root<HTMLCanvasElement> { + fn Canvas(&self) -> Root<HTMLCanvasElement> { self.canvas.root() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-save - fn Save(self) { + fn Save(&self) { self.saved_states.borrow_mut().push(self.state.borrow().clone()); self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::SaveContext)).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore - fn Restore(self) { + fn Restore(&self) { let mut saved_states = self.saved_states.borrow_mut(); if let Some(state) = saved_states.pop() { self.state.borrow_mut().clone_from(&state); @@ -468,7 +468,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale - fn Scale(self, x: f64, y: f64) { + fn Scale(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -479,7 +479,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate - fn Rotate(self, angle: f64) { + fn Rotate(&self, angle: f64) { if angle == 0.0 || !angle.is_finite() { return; } @@ -493,7 +493,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate - fn Translate(self, x: f64, y: f64) { + fn Translate(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -504,7 +504,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform - fn Transform(self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { if !(a.is_finite() && b.is_finite() && c.is_finite() && d.is_finite() && e.is_finite() && f.is_finite()) { return; @@ -521,7 +521,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform - fn SetTransform(self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { + fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { if !(a.is_finite() && b.is_finite() && c.is_finite() && d.is_finite() && e.is_finite() && f.is_finite()) { return; @@ -537,19 +537,19 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform - fn ResetTransform(self) { + fn ResetTransform(&self) { self.state.borrow_mut().transform = Matrix2D::identity(); self.update_transform() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha - fn GlobalAlpha(self) -> f64 { + fn GlobalAlpha(&self) -> f64 { let state = self.state.borrow(); state.global_alpha } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha - fn SetGlobalAlpha(self, alpha: f64) { + fn SetGlobalAlpha(&self, alpha: f64) { if !alpha.is_finite() || alpha > 1.0 || alpha < 0.0 { return; } @@ -561,7 +561,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation - fn GlobalCompositeOperation(self) -> DOMString { + fn GlobalCompositeOperation(&self) -> DOMString { let state = self.state.borrow(); match state.global_composition { CompositionOrBlending::Composition(op) => op.to_str().to_owned(), @@ -570,7 +570,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation - fn SetGlobalCompositeOperation(self, op_str: DOMString) { + fn SetGlobalCompositeOperation(&self, op_str: DOMString) { if let Some(op) = CompositionOrBlending::from_str(&op_str) { self.state.borrow_mut().global_composition = op; self.ipc_renderer @@ -580,7 +580,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect - fn FillRect(self, x: f64, y: f64, width: f64, height: f64) { + fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { if let Some(rect) = self.create_drawable_rect(x, y, width, height) { self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::FillRect(rect))).unwrap(); self.mark_as_dirty(); @@ -588,7 +588,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect - fn ClearRect(self, x: f64, y: f64, width: f64, height: f64) { + fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { if let Some(rect) = self.create_drawable_rect(x, y, width, height) { self.ipc_renderer .send(CanvasMsg::Canvas2d(Canvas2dMsg::ClearRect(rect))) @@ -598,7 +598,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect - fn StrokeRect(self, x: f64, y: f64, width: f64, height: f64) { + fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { if let Some(rect) = self.create_drawable_rect(x, y, width, height) { self.ipc_renderer .send(CanvasMsg::Canvas2d(Canvas2dMsg::StrokeRect(rect))) @@ -608,36 +608,36 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath - fn BeginPath(self) { + fn BeginPath(&self) { self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::BeginPath)).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath - fn ClosePath(self) { + fn ClosePath(&self) { self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::ClosePath)).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill - fn Fill(self, _: CanvasWindingRule) { + fn Fill(&self, _: CanvasWindingRule) { // TODO: Process winding rule self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::Fill)).unwrap(); self.mark_as_dirty(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke - fn Stroke(self) { + fn Stroke(&self) { self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::Stroke)).unwrap(); self.mark_as_dirty(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip - fn Clip(self, _: CanvasWindingRule) { + fn Clip(&self, _: CanvasWindingRule) { // TODO: Process winding rule self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::Clip)).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage(self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, + fn DrawImage(&self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, dx: f64, dy: f64) -> Fallible<()> { if !(dx.is_finite() && dy.is_finite()) { return Ok(()); @@ -647,7 +647,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage_(self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, + fn DrawImage_(&self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, dx: f64, dy: f64, dw: f64, dh: f64) -> Fallible<()> { if !(dx.is_finite() && dy.is_finite() && dw.is_finite() && dh.is_finite()) { @@ -658,7 +658,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage - fn DrawImage__(self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, + fn DrawImage__(&self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, sx: f64, sy: f64, sw: f64, sh: f64, dx: f64, dy: f64, dw: f64, dh: f64) -> Fallible<()> { if !(sx.is_finite() && sy.is_finite() && sw.is_finite() && sh.is_finite() && @@ -670,7 +670,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto - fn MoveTo(self, x: f64, y: f64) { + fn MoveTo(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -682,7 +682,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto - fn LineTo(self, x: f64, y: f64) { + fn LineTo(&self, x: f64, y: f64) { if !(x.is_finite() && y.is_finite()) { return; } @@ -694,7 +694,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect - fn Rect(self, x: f64, y: f64, width: f64, height: f64) { + fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { if [x, y, width, height].iter().all(|val| val.is_finite()) { let rect = Rect::new(Point2D::new(x as f32, y as f32), Size2D::new(width as f32, height as f32)); @@ -704,7 +704,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto - fn QuadraticCurveTo(self, cpx: f64, cpy: f64, x: f64, y: f64) { + fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { if !(cpx.is_finite() && cpy.is_finite() && x.is_finite() && y.is_finite()) { return; @@ -718,7 +718,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto - fn BezierCurveTo(self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { + fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { if !(cp1x.is_finite() && cp1y.is_finite() && cp2x.is_finite() && cp2y.is_finite() && x.is_finite() && y.is_finite()) { return; @@ -733,7 +733,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc - fn Arc(self, x: f64, y: f64, r: f64, + fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> Fallible<()> { if !([x, y, r, start, end].iter().all(|x| x.is_finite())) { return Ok(()); @@ -753,7 +753,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto - fn ArcTo(self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> Fallible<()> { + fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> Fallible<()> { if !([cp1x, cp1y, cp2x, cp2y, r].iter().all(|x| x.is_finite())) { return Ok(()); } @@ -771,18 +771,18 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/#dom-context-2d-imagesmoothingenabled - fn ImageSmoothingEnabled(self) -> bool { + fn ImageSmoothingEnabled(&self) -> bool { let state = self.state.borrow(); state.image_smoothing_enabled } // https://html.spec.whatwg.org/#dom-context-2d-imagesmoothingenabled - fn SetImageSmoothingEnabled(self, value: bool) -> () { + fn SetImageSmoothingEnabled(&self, value: bool) -> () { self.state.borrow_mut().image_smoothing_enabled = value; } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle - fn StrokeStyle(self) -> StringOrCanvasGradientOrCanvasPattern { + fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { match self.state.borrow().stroke_style { CanvasFillOrStrokeStyle::Color(ref rgba) => { let mut result = String::new(); @@ -796,7 +796,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle - fn SetStrokeStyle(self, value: StringOrCanvasGradientOrCanvasPattern) { + fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { match value { StringOrCanvasGradientOrCanvasPattern::eString(string) => { match parse_color(&string) { @@ -822,7 +822,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle - fn FillStyle(self) -> StringOrCanvasGradientOrCanvasPattern { + fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { match self.state.borrow().fill_style { CanvasFillOrStrokeStyle::Color(ref rgba) => { let mut result = String::new(); @@ -836,7 +836,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle - fn SetFillStyle(self, value: StringOrCanvasGradientOrCanvasPattern) { + fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) { match value { StringOrCanvasGradientOrCanvasPattern::eString(string) => { if let Ok(rgba) = parse_color(&string) { @@ -862,7 +862,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata - fn CreateImageData(self, sw: Finite<f64>, sh: Finite<f64>) -> Fallible<Root<ImageData>> { + fn CreateImageData(&self, sw: Finite<f64>, sh: Finite<f64>) -> Fallible<Root<ImageData>> { if *sw == 0.0 || *sh == 0.0 { return Err(IndexSize) } @@ -873,12 +873,12 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata - fn CreateImageData_(self, imagedata: &ImageData) -> Fallible<Root<ImageData>> { + fn CreateImageData_(&self, imagedata: &ImageData) -> Fallible<Root<ImageData>> { Ok(ImageData::new(self.global.root().r(), imagedata.Width(), imagedata.Height(), None)) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata - fn GetImageData(self, + fn GetImageData(&self, sx: Finite<f64>, sy: Finite<f64>, sw: Finite<f64>, @@ -928,13 +928,13 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata - fn PutImageData(self, imagedata: &ImageData, dx: Finite<f64>, dy: Finite<f64>) { + fn PutImageData(&self, imagedata: &ImageData, dx: Finite<f64>, dy: Finite<f64>) { self.PutImageData_(imagedata, dx, dy, Finite::wrap(0f64), Finite::wrap(0f64), Finite::wrap(imagedata.Width() as f64), Finite::wrap(imagedata.Height() as f64)) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata - fn PutImageData_(self, imagedata: &ImageData, dx: Finite<f64>, dy: Finite<f64>, + fn PutImageData_(&self, imagedata: &ImageData, dx: Finite<f64>, dy: Finite<f64>, dirtyX: Finite<f64>, dirtyY: Finite<f64>, dirtyWidth: Finite<f64>, dirtyHeight: Finite<f64>) { let data = imagedata.get_data_array(&self.global.root().r()); let offset = Point2D::new(*dx, *dy); @@ -949,14 +949,14 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createlineargradient - fn CreateLinearGradient(self, x0: Finite<f64>, y0: Finite<f64>, + fn CreateLinearGradient(&self, x0: Finite<f64>, y0: Finite<f64>, x1: Finite<f64>, y1: Finite<f64>) -> Root<CanvasGradient> { CanvasGradient::new(self.global.root().r(), CanvasGradientStyle::Linear(LinearGradientStyle::new(*x0, *y0, *x1, *y1, Vec::new()))) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient - fn CreateRadialGradient(self, x0: Finite<f64>, y0: Finite<f64>, r0: Finite<f64>, + fn CreateRadialGradient(&self, x0: Finite<f64>, y0: Finite<f64>, r0: Finite<f64>, x1: Finite<f64>, y1: Finite<f64>, r1: Finite<f64>) -> Fallible<Root<CanvasGradient>> { if *r0 < 0. || *r1 < 0. { @@ -969,7 +969,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern - fn CreatePattern(self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, + fn CreatePattern(&self, image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D, repetition: DOMString) -> Fallible<Root<CanvasPattern>> { let (image_data, image_size) = match image { HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLImageElement(image) => { @@ -1019,13 +1019,13 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth - fn LineWidth(self) -> f64 { + fn LineWidth(&self) -> f64 { let state = self.state.borrow(); state.line_width } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth - fn SetLineWidth(self, width: f64) { + fn SetLineWidth(&self, width: f64) { if !width.is_finite() || width <= 0.0 { return; } @@ -1037,7 +1037,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap - fn LineCap(self) -> DOMString { + fn LineCap(&self) -> DOMString { let state = self.state.borrow(); match state.line_cap { LineCapStyle::Butt => "butt".to_owned(), @@ -1047,7 +1047,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap - fn SetLineCap(self, cap_str: DOMString) { + fn SetLineCap(&self, cap_str: DOMString) { if let Some(cap) = LineCapStyle::from_str(&cap_str) { self.state.borrow_mut().line_cap = cap; self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::SetLineCap(cap))).unwrap() @@ -1055,7 +1055,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin - fn LineJoin(self) -> DOMString { + fn LineJoin(&self) -> DOMString { let state = self.state.borrow(); match state.line_join { LineJoinStyle::Round => "round".to_owned(), @@ -1065,7 +1065,7 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin - fn SetLineJoin(self, join_str: DOMString) { + fn SetLineJoin(&self, join_str: DOMString) { if let Some(join) = LineJoinStyle::from_str(&join_str) { self.state.borrow_mut().line_join = join; self.ipc_renderer.send(CanvasMsg::Canvas2d(Canvas2dMsg::SetLineJoin(join))).unwrap() @@ -1073,13 +1073,13 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit - fn MiterLimit(self) -> f64 { + fn MiterLimit(&self) -> f64 { let state = self.state.borrow(); state.miter_limit } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit - fn SetMiterLimit(self, limit: f64) { + fn SetMiterLimit(&self, limit: f64) { if !limit.is_finite() || limit <= 0.0 { return; } @@ -1091,12 +1091,12 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx - fn ShadowOffsetX(self) -> f64 { + fn ShadowOffsetX(&self) -> f64 { self.state.borrow().shadow_offset_x } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx - fn SetShadowOffsetX(self, value: f64) { + fn SetShadowOffsetX(&self, value: f64) { if !value.is_finite() || value == self.state.borrow().shadow_offset_x { return; } @@ -1105,12 +1105,12 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety - fn ShadowOffsetY(self) -> f64 { + fn ShadowOffsetY(&self) -> f64 { self.state.borrow().shadow_offset_y } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety - fn SetShadowOffsetY(self, value: f64) { + fn SetShadowOffsetY(&self, value: f64) { if !value.is_finite() || value == self.state.borrow().shadow_offset_y { return; } @@ -1119,12 +1119,12 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur - fn ShadowBlur(self) -> f64 { + fn ShadowBlur(&self) -> f64 { self.state.borrow().shadow_blur } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur - fn SetShadowBlur(self, value: f64) { + fn SetShadowBlur(&self, value: f64) { if !value.is_finite() || value < 0f64 || value == self.state.borrow().shadow_blur { return; } @@ -1133,14 +1133,14 @@ impl<'a> CanvasRenderingContext2DMethods for &'a CanvasRenderingContext2D { } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor - fn ShadowColor(self) -> DOMString { + fn ShadowColor(&self) -> DOMString { let mut result = String::new(); serialize(&self.state.borrow().shadow_color, &mut result).unwrap(); result } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor - fn SetShadowColor(self, value: DOMString) { + fn SetShadowColor(&self, value: DOMString) { if let Ok(color) = parse_color(&value) { self.state.borrow_mut().shadow_color = color; self.ipc_renderer diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index c9e7dca7039..47427eb4444 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -47,24 +47,24 @@ impl CharacterData { } } -impl<'a> CharacterDataMethods for &'a CharacterData { +impl CharacterDataMethods for CharacterData { // https://dom.spec.whatwg.org/#dom-characterdata-data - fn Data(self) -> DOMString { + fn Data(&self) -> DOMString { self.data.borrow().clone() } // https://dom.spec.whatwg.org/#dom-characterdata-data - fn SetData(self, data: DOMString) { + fn SetData(&self, data: DOMString) { *self.data.borrow_mut() = data; } // https://dom.spec.whatwg.org/#dom-characterdata-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { self.data.borrow().chars().count() as u32 } // https://dom.spec.whatwg.org/#dom-characterdata-substringdataoffset-count - fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> { + fn SubstringData(&self, offset: u32, count: u32) -> Fallible<DOMString> { let data = self.data.borrow(); // Step 1. let length = data.chars().count() as u32; @@ -78,22 +78,22 @@ impl<'a> CharacterDataMethods for &'a CharacterData { } // https://dom.spec.whatwg.org/#dom-characterdata-appenddatadata - fn AppendData(self, data: DOMString) { + fn AppendData(&self, data: DOMString) { self.append_data(&*data); } // https://dom.spec.whatwg.org/#dom-characterdata-insertdataoffset-data - fn InsertData(self, offset: u32, arg: DOMString) -> ErrorResult { + fn InsertData(&self, offset: u32, arg: DOMString) -> ErrorResult { self.ReplaceData(offset, 0, arg) } // https://dom.spec.whatwg.org/#dom-characterdata-deletedataoffset-count - fn DeleteData(self, offset: u32, count: u32) -> ErrorResult { + fn DeleteData(&self, offset: u32, count: u32) -> ErrorResult { self.ReplaceData(offset, count, "".to_owned()) } // https://dom.spec.whatwg.org/#dom-characterdata-replacedataoffset-count-data - fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { + fn ReplaceData(&self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { // Step 1. let length = self.data.borrow().chars().count() as u32; if offset > length { @@ -116,34 +116,34 @@ impl<'a> CharacterDataMethods for &'a CharacterData { } // https://dom.spec.whatwg.org/#dom-childnode-before - fn Before(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Before(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).before(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-after - fn After(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn After(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).after(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-replacewith - fn ReplaceWith(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn ReplaceWith(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).replace_with(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(self) { + fn Remove(&self) { let node = NodeCast::from_ref(self); node.remove_self(); } // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling - fn GetPreviousElementSibling(self) -> Option<Root<Element>> { + fn GetPreviousElementSibling(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).preceding_siblings() .filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-nextelementsibling - fn GetNextElementSibling(self) -> Option<Root<Element>> { + fn GetNextElementSibling(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).following_siblings() .filter_map(ElementCast::to_root).next() } diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 0d251642b3c..5dfbaf5aecd 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -68,19 +68,19 @@ impl CloseEvent { } } -impl<'a> CloseEventMethods for &'a CloseEvent { +impl CloseEventMethods for CloseEvent { // https://html.spec.whatwg.org/multipage/#dom-closeevent-wasclean - fn WasClean(self) -> bool { + fn WasClean(&self) -> bool { self.wasClean } // https://html.spec.whatwg.org/multipage/#dom-closeevent-code - fn Code(self) -> u16 { + fn Code(&self) -> u16 { self.code } // https://html.spec.whatwg.org/multipage/#dom-closeevent-reason - fn Reason(self) -> DOMString { + fn Reason(&self) -> DOMString { self.reason.clone() } } diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 4dd5055b535..faa3c507e5f 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -30,9 +30,9 @@ impl Console { } } -impl<'a> ConsoleMethods for &'a Console { +impl ConsoleMethods for Console { // https://developer.mozilla.org/en-US/docs/Web/API/Console/log - fn Log(self, messages: Vec<DOMString>) { + fn Log(&self, messages: Vec<DOMString>) { for message in messages { println!("{}", message); propagate_console_msg(&self, prepare_message(LogLevel::Log, message)); @@ -40,7 +40,7 @@ impl<'a> ConsoleMethods for &'a Console { } // https://developer.mozilla.org/en-US/docs/Web/API/Console - fn Debug(self, messages: Vec<DOMString>) { + fn Debug(&self, messages: Vec<DOMString>) { for message in messages { println!("{}", message); propagate_console_msg(&self, prepare_message(LogLevel::Debug, message)); @@ -48,7 +48,7 @@ impl<'a> ConsoleMethods for &'a Console { } // https://developer.mozilla.org/en-US/docs/Web/API/Console/info - fn Info(self, messages: Vec<DOMString>) { + fn Info(&self, messages: Vec<DOMString>) { for message in messages { println!("{}", message); propagate_console_msg(&self, prepare_message(LogLevel::Info, message)); @@ -56,7 +56,7 @@ impl<'a> ConsoleMethods for &'a Console { } // https://developer.mozilla.org/en-US/docs/Web/API/Console/warn - fn Warn(self, messages: Vec<DOMString>) { + fn Warn(&self, messages: Vec<DOMString>) { for message in messages { println!("{}", message); propagate_console_msg(&self, prepare_message(LogLevel::Warn, message)); @@ -64,7 +64,7 @@ impl<'a> ConsoleMethods for &'a Console { } // https://developer.mozilla.org/en-US/docs/Web/API/Console/error - fn Error(self, messages: Vec<DOMString>) { + fn Error(&self, messages: Vec<DOMString>) { for message in messages { println!("{}", message); propagate_console_msg(&self, prepare_message(LogLevel::Error, message)); @@ -72,7 +72,7 @@ impl<'a> ConsoleMethods for &'a Console { } // https://developer.mozilla.org/en-US/docs/Web/API/Console/assert - 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, diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 63f56c9523a..49ca25ff376 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -40,10 +40,10 @@ impl Crypto { } } -impl<'a> CryptoMethods for &'a Crypto { +impl CryptoMethods for Crypto { #[allow(unsafe_code)] // https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#Crypto-method-getRandomValues - fn GetRandomValues(self, _cx: *mut JSContext, input: *mut JSObject) + fn GetRandomValues(&self, _cx: *mut JSContext, input: *mut JSObject) -> Fallible<*mut JSObject> { let mut length = 0; let mut data = ptr::null_mut(); diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 32d351d3106..6ad92840958 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -39,10 +39,10 @@ pub enum CSSModificationAccess { macro_rules! css_properties( ( $([$getter:ident, $setter:ident, $cssprop:expr]),* ) => ( $( - fn $getter(self) -> DOMString { + fn $getter(&self) -> DOMString { self.GetPropertyValue($cssprop.to_owned()) } - fn $setter(self, value: DOMString) -> ErrorResult { + fn $setter(&self, value: DOMString) -> ErrorResult { self.SetPropertyValue($cssprop.to_owned(), value) } )* @@ -90,9 +90,9 @@ impl CSSStyleDeclaration { } } -impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { +impl CSSStyleDeclarationMethods for CSSStyleDeclaration { // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { let owner = self.owner.root(); let elem = ElementCast::from_ref(owner.r()); let len = match *elem.style_attribute().borrow() { @@ -103,7 +103,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-item - fn Item(self, index: u32) -> DOMString { + fn Item(&self, index: u32) -> DOMString { let index = index as usize; let owner = self.owner.root(); let elem = ElementCast::from_ref(owner.r()); @@ -124,7 +124,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertyvalue - fn GetPropertyValue(self, property: DOMString) -> DOMString { + fn GetPropertyValue(&self, property: DOMString) -> DOMString { let owner = self.owner.root(); // Step 1 @@ -167,7 +167,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertypriority - fn GetPropertyPriority(self, property: DOMString) -> DOMString { + fn GetPropertyPriority(&self, property: DOMString) -> DOMString { // Step 1 let property = Atom::from_slice(&property.to_ascii_lowercase()); @@ -195,7 +195,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-setproperty - fn SetProperty(self, property: DOMString, value: DOMString, + fn SetProperty(&self, property: DOMString, value: DOMString, priority: DOMString) -> ErrorResult { // Step 1 if self.readonly { @@ -250,7 +250,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-setpropertypriority - fn SetPropertyPriority(self, property: DOMString, priority: DOMString) -> ErrorResult { + fn SetPropertyPriority(&self, property: DOMString, priority: DOMString) -> ErrorResult { // Step 1 if self.readonly { return Err(Error::NoModificationAllowed); @@ -284,12 +284,12 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-setpropertyvalue - fn SetPropertyValue(self, property: DOMString, value: DOMString) -> ErrorResult { + fn SetPropertyValue(&self, property: DOMString, value: DOMString) -> ErrorResult { self.SetProperty(property, value, "".to_owned()) } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-removeproperty - fn RemoveProperty(self, property: DOMString) -> Fallible<DOMString> { + fn RemoveProperty(&self, property: DOMString) -> Fallible<DOMString> { // Step 1 if self.readonly { return Err(Error::NoModificationAllowed); @@ -320,17 +320,17 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration { } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-cssfloat - fn CssFloat(self) -> DOMString { + fn CssFloat(&self) -> DOMString { self.GetPropertyValue("float".to_owned()) } // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-cssfloat - fn SetCssFloat(self, value: DOMString) -> ErrorResult { + fn SetCssFloat(&self, value: DOMString) -> ErrorResult { self.SetPropertyValue("float".to_owned(), value) } // https://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface - fn IndexedGetter(self, index: u32, found: &mut bool) -> DOMString { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> DOMString { let rval = self.Item(index); *found = index < self.Length(); rval diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index 17e8bfdd4a7..a0bd520bb1e 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -62,14 +62,14 @@ impl CustomEvent { } } -impl<'a> CustomEventMethods for &'a CustomEvent { +impl CustomEventMethods for CustomEvent { // https://dom.spec.whatwg.org/#dom-customevent-detail - fn Detail(self, _cx: *mut JSContext) -> JSVal { + fn Detail(&self, _cx: *mut JSContext) -> JSVal { self.detail.get() } // https://dom.spec.whatwg.org/#dom-customevent-initcustomevent - fn InitCustomEvent(self, + fn InitCustomEvent(&self, _cx: *mut JSContext, type_: DOMString, can_bubble: bool, diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index e9c32f7f2cd..efc5dc238c6 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -354,9 +354,9 @@ impl DedicatedWorkerGlobalScope { } } -impl<'a> DedicatedWorkerGlobalScopeMethods for &'a DedicatedWorkerGlobalScope { +impl DedicatedWorkerGlobalScopeMethods for DedicatedWorkerGlobalScope { // https://html.spec.whatwg.org/multipage/#dom-dedicatedworkerglobalscope-postmessage - fn PostMessage(self, cx: *mut JSContext, message: HandleValue) -> ErrorResult { + fn PostMessage(&self, cx: *mut JSContext, message: HandleValue) -> ErrorResult { let data = try!(StructuredCloneData::write(cx, message)); let worker = self.worker.borrow().as_ref().unwrap().clone(); self.parent_sender.send(CommonScriptMsg::RunnableMsg( diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 3166ec0eb69..3841c0a45cb 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1127,19 +1127,19 @@ impl Node { } } -impl<'a> DocumentMethods for &'a Document { +impl DocumentMethods for Document { // https://dom.spec.whatwg.org/#dom-document-implementation - fn Implementation(self) -> Root<DOMImplementation> { + fn Implementation(&self) -> Root<DOMImplementation> { self.implementation.or_init(|| DOMImplementation::new(self)) } // https://dom.spec.whatwg.org/#dom-document-url - fn URL(self) -> DOMString { + fn URL(&self) -> DOMString { self.url().serialize() } // https://html.spec.whatwg.org/multipage/#dom-document-activeelement - fn GetActiveElement(self) -> Option<Root<Element>> { + fn GetActiveElement(&self) -> Option<Root<Element>> { // TODO: Step 2. match self.get_focused_element() { @@ -1152,7 +1152,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-hasfocus - fn HasFocus(self) -> bool { + fn HasFocus(&self) -> bool { let target = self; // Step 1. let window = self.window.root(); let window = window.r(); @@ -1173,12 +1173,12 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-documenturi - fn DocumentURI(self) -> DOMString { + fn DocumentURI(&self) -> DOMString { self.URL() } // https://dom.spec.whatwg.org/#dom-document-compatmode - fn CompatMode(self) -> DOMString { + fn CompatMode(&self) -> DOMString { match self.quirks_mode.get() { LimitedQuirks | NoQuirks => "CSS1Compat".to_owned(), Quirks => "BackCompat".to_owned() @@ -1186,22 +1186,22 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-characterset - fn CharacterSet(self) -> DOMString { + fn CharacterSet(&self) -> DOMString { self.encoding_name.borrow().clone() } // https://dom.spec.whatwg.org/#dom-document-inputencoding - fn InputEncoding(self) -> DOMString { + fn InputEncoding(&self) -> DOMString { self.encoding_name.borrow().clone() } // https://dom.spec.whatwg.org/#dom-document-content_type - fn ContentType(self) -> DOMString { + fn ContentType(&self) -> DOMString { self.content_type.clone() } // https://dom.spec.whatwg.org/#dom-document-doctype - fn GetDoctype(self) -> Option<Root<DocumentType>> { + fn GetDoctype(&self) -> Option<Root<DocumentType>> { let node = NodeCast::from_ref(self); node.children() .filter_map(|c| DocumentTypeCast::to_ref(c.r()).map(Root::from_ref)) @@ -1209,39 +1209,39 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-documentelement - fn GetDocumentElement(self) -> Option<Root<Element>> { + fn GetDocumentElement(&self) -> Option<Root<Element>> { let node = NodeCast::from_ref(self); node.child_elements().next() } // https://dom.spec.whatwg.org/#dom-document-getelementsbytagname - fn GetElementsByTagName(self, tag_name: DOMString) -> Root<HTMLCollection> { + fn GetElementsByTagName(&self, tag_name: DOMString) -> Root<HTMLCollection> { let window = self.window.root(); HTMLCollection::by_tag_name(window.r(), NodeCast::from_ref(self), tag_name) } // https://dom.spec.whatwg.org/#dom-document-getelementsbytagnamens - fn GetElementsByTagNameNS(self, maybe_ns: Option<DOMString>, tag_name: DOMString) + fn GetElementsByTagNameNS(&self, maybe_ns: Option<DOMString>, tag_name: DOMString) -> Root<HTMLCollection> { let window = self.window.root(); HTMLCollection::by_tag_name_ns(window.r(), NodeCast::from_ref(self), tag_name, maybe_ns) } // https://dom.spec.whatwg.org/#dom-document-getelementsbyclassname - fn GetElementsByClassName(self, classes: DOMString) -> Root<HTMLCollection> { + fn GetElementsByClassName(&self, classes: DOMString) -> Root<HTMLCollection> { let window = self.window.root(); HTMLCollection::by_class_name(window.r(), NodeCast::from_ref(self), classes) } // https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid - fn GetElementById(self, id: DOMString) -> Option<Root<Element>> { + fn GetElementById(&self, id: DOMString) -> Option<Root<Element>> { let id = Atom::from_slice(&id); self.idmap.borrow().get(&id).map(|ref elements| (*elements)[0].root()) } // https://dom.spec.whatwg.org/#dom-document-createelement - fn CreateElement(self, mut local_name: DOMString) -> Fallible<Root<Element>> { + fn CreateElement(&self, mut local_name: DOMString) -> Fallible<Root<Element>> { if xml_name_type(&local_name) == InvalidXMLName { debug!("Not a valid element name"); return Err(InvalidCharacter); @@ -1254,7 +1254,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createelementns - fn CreateElementNS(self, + fn CreateElementNS(&self, namespace: Option<DOMString>, qualified_name: DOMString) -> Fallible<Root<Element>> { let (namespace, prefix, local_name) = @@ -1264,7 +1264,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createattribute - fn CreateAttribute(self, local_name: DOMString) -> Fallible<Root<Attr>> { + fn CreateAttribute(&self, local_name: DOMString) -> Fallible<Root<Attr>> { if xml_name_type(&local_name) == InvalidXMLName { debug!("Not a valid element name"); return Err(InvalidCharacter); @@ -1280,7 +1280,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createattributens - fn CreateAttributeNS(self, namespace: Option<DOMString>, qualified_name: DOMString) + fn CreateAttributeNS(&self, namespace: Option<DOMString>, qualified_name: DOMString) -> Fallible<Root<Attr>> { let (namespace, prefix, local_name) = try!(validate_and_extract(namespace, &qualified_name)); @@ -1292,22 +1292,22 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createdocumentfragment - fn CreateDocumentFragment(self) -> Root<DocumentFragment> { + fn CreateDocumentFragment(&self) -> Root<DocumentFragment> { DocumentFragment::new(self) } // https://dom.spec.whatwg.org/#dom-document-createtextnode - fn CreateTextNode(self, data: DOMString) -> Root<Text> { + fn CreateTextNode(&self, data: DOMString) -> Root<Text> { Text::new(data, self) } // https://dom.spec.whatwg.org/#dom-document-createcomment - fn CreateComment(self, data: DOMString) -> Root<Comment> { + fn CreateComment(&self, data: DOMString) -> Root<Comment> { Comment::new(data, self) } // https://dom.spec.whatwg.org/#dom-document-createprocessinginstruction - fn CreateProcessingInstruction(self, target: DOMString, data: DOMString) -> + fn CreateProcessingInstruction(&self, target: DOMString, data: DOMString) -> Fallible<Root<ProcessingInstruction>> { // Step 1. if xml_name_type(&target) == InvalidXMLName { @@ -1324,7 +1324,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-importnode - fn ImportNode(self, node: &Node, deep: bool) -> Fallible<Root<Node>> { + fn ImportNode(&self, node: &Node, deep: bool) -> Fallible<Root<Node>> { // Step 1. if node.is_document() { return Err(NotSupported); @@ -1340,7 +1340,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-adoptnode - fn AdoptNode(self, node: &Node) -> Fallible<Root<Node>> { + fn AdoptNode(&self, node: &Node) -> Fallible<Root<Node>> { // Step 1. if node.is_document() { return Err(NotSupported); @@ -1354,7 +1354,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createevent - fn CreateEvent(self, interface: DOMString) -> Fallible<Root<Event>> { + fn CreateEvent(&self, interface: DOMString) -> Fallible<Root<Event>> { let window = self.window.root(); match &*interface.to_ascii_lowercase() { @@ -1375,7 +1375,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-lastmodified - fn LastModified(self) -> DOMString { + fn LastModified(&self) -> DOMString { match self.last_modified { Some(ref t) => t.clone(), None => time::now().strftime("%m/%d/%Y %H:%M:%S").unwrap().to_string(), @@ -1383,24 +1383,24 @@ impl<'a> DocumentMethods for &'a Document { } // https://dom.spec.whatwg.org/#dom-document-createrange - fn CreateRange(self) -> Root<Range> { + fn CreateRange(&self) -> Root<Range> { Range::new_with_doc(self) } // https://dom.spec.whatwg.org/#dom-document-createnodeiteratorroot-whattoshow-filter - fn CreateNodeIterator(self, root: &Node, whatToShow: u32, filter: Option<Rc<NodeFilter>>) + fn CreateNodeIterator(&self, root: &Node, whatToShow: u32, filter: Option<Rc<NodeFilter>>) -> Root<NodeIterator> { NodeIterator::new(self, root, whatToShow, filter) } // https://dom.spec.whatwg.org/#dom-document-createtreewalker - fn CreateTreeWalker(self, root: &Node, whatToShow: u32, filter: Option<Rc<NodeFilter>>) + fn CreateTreeWalker(&self, root: &Node, whatToShow: u32, filter: Option<Rc<NodeFilter>>) -> Root<TreeWalker> { TreeWalker::new(self, root, whatToShow, filter) } // https://html.spec.whatwg.org/#document.title - fn Title(self) -> DOMString { + fn Title(&self) -> DOMString { let title = self.GetDocumentElement().and_then(|root| { if root.r().namespace() == &ns!(SVG) && root.r().local_name() == &atom!("svg") { // Step 1. @@ -1427,7 +1427,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#document.title - fn SetTitle(self, title: DOMString) { + fn SetTitle(&self, title: DOMString) { let root = match self.GetDocumentElement() { Some(root) => root, None => return, @@ -1478,7 +1478,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-head - fn GetHead(self) -> Option<Root<HTMLHeadElement>> { + fn GetHead(&self) -> Option<Root<HTMLHeadElement>> { self.get_html_element().and_then(|root| { let node = NodeCast::from_ref(root.r()); node.children() @@ -1488,12 +1488,12 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-currentscript - fn GetCurrentScript(self) -> Option<Root<HTMLScriptElement>> { + fn GetCurrentScript(&self) -> Option<Root<HTMLScriptElement>> { self.current_script.get().map(Root::from_rooted) } // https://html.spec.whatwg.org/#dom-document-body - fn GetBody(self) -> Option<Root<HTMLElement>> { + fn GetBody(&self) -> Option<Root<HTMLElement>> { self.get_html_element().and_then(|root| { let node = NodeCast::from_ref(root.r()); node.children().find(|child| { @@ -1509,7 +1509,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-body - fn SetBody(self, new_body: Option<&HTMLElement>) -> ErrorResult { + fn SetBody(&self, new_body: Option<&HTMLElement>) -> ErrorResult { // Step 1. let new_body = match new_body { Some(new_body) => new_body, @@ -1552,7 +1552,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-getelementsbyname - fn GetElementsByName(self, name: DOMString) -> Root<NodeList> { + fn GetElementsByName(&self, name: DOMString) -> Root<NodeList> { self.create_node_list(|node| { let element = match ElementCast::to_ref(node) { Some(element) => element, @@ -1568,7 +1568,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-images - fn Images(self) -> Root<HTMLCollection> { + fn Images(&self) -> Root<HTMLCollection> { self.images.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1578,7 +1578,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-embeds - fn Embeds(self) -> Root<HTMLCollection> { + fn Embeds(&self) -> Root<HTMLCollection> { self.embeds.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1588,12 +1588,12 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-plugins - fn Plugins(self) -> Root<HTMLCollection> { + fn Plugins(&self) -> Root<HTMLCollection> { self.Embeds() } // https://html.spec.whatwg.org/#dom-document-links - fn Links(self) -> Root<HTMLCollection> { + fn Links(&self) -> Root<HTMLCollection> { self.links.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1603,7 +1603,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-forms - fn Forms(self) -> Root<HTMLCollection> { + fn Forms(&self) -> Root<HTMLCollection> { self.forms.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1613,7 +1613,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-scripts - fn Scripts(self) -> Root<HTMLCollection> { + fn Scripts(&self) -> Root<HTMLCollection> { self.scripts.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1623,7 +1623,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-anchors - fn Anchors(self) -> Root<HTMLCollection> { + fn Anchors(&self) -> Root<HTMLCollection> { self.anchors.or_init(|| { let window = self.window.root(); let root = NodeCast::from_ref(self); @@ -1633,7 +1633,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-applets - fn Applets(self) -> Root<HTMLCollection> { + fn Applets(&self) -> Root<HTMLCollection> { // FIXME: This should be return OBJECT elements containing applets. self.applets.or_init(|| { let window = self.window.root(); @@ -1644,67 +1644,67 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/#dom-document-location - fn Location(self) -> Root<Location> { + fn Location(&self) -> Root<Location> { let window = self.window.root(); let window = window.r(); self.location.or_init(|| Location::new(window)) } // https://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(self) -> Root<HTMLCollection> { + fn Children(&self) -> Root<HTMLCollection> { let window = self.window.root(); HTMLCollection::children(window.r(), NodeCast::from_ref(self)) } // https://dom.spec.whatwg.org/#dom-parentnode-firstelementchild - fn GetFirstElementChild(self) -> Option<Root<Element>> { + fn GetFirstElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).child_elements().next() } // https://dom.spec.whatwg.org/#dom-parentnode-lastelementchild - fn GetLastElementChild(self) -> Option<Root<Element>> { + fn GetLastElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).rev_children().filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-parentnode-childelementcount - fn ChildElementCount(self) -> u32 { + fn ChildElementCount(&self) -> u32 { NodeCast::from_ref(self).child_elements().count() as u32 } // https://dom.spec.whatwg.org/#dom-parentnode-prepend - fn Prepend(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Prepend(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).prepend(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-append - fn Append(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Append(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).append(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { + fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Root<NodeList>> { + fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Root<NodeList>> { let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } // https://html.spec.whatwg.org/multipage/#dom-document-readystate - fn ReadyState(self) -> DocumentReadyState { + fn ReadyState(&self) -> DocumentReadyState { self.ready_state.get() } // https://html.spec.whatwg.org/multipage/#dom-document-defaultview - fn DefaultView(self) -> Root<Window> { + fn DefaultView(&self) -> Root<Window> { self.window.root() } // https://html.spec.whatwg.org/multipage/#dom-document-cookie - fn GetCookie(self) -> Fallible<DOMString> { + fn GetCookie(&self) -> Fallible<DOMString> { //TODO: return empty string for cookie-averse Document let url = self.url(); if !is_scheme_host_port_tuple(&url) { @@ -1718,7 +1718,7 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/multipage/#dom-document-cookie - fn SetCookie(self, cookie: DOMString) -> ErrorResult { + fn SetCookie(&self, cookie: DOMString) -> ErrorResult { //TODO: ignore for cookie-averse Document let url = self.url(); if !is_scheme_host_port_tuple(&url) { @@ -1730,17 +1730,17 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/multipage/#dom-document-bgcolor - fn BgColor(self) -> DOMString { + fn BgColor(&self) -> DOMString { self.get_body_attribute(&atom!("bgcolor")) } // https://html.spec.whatwg.org/multipage/#dom-document-bgcolor - fn SetBgColor(self, value: DOMString) { + fn SetBgColor(&self, value: DOMString) { self.set_body_attribute(&atom!("bgcolor"), value) } // https://html.spec.whatwg.org/multipage/#dom-tree-accessors:dom-document-nameditem-filter - fn NamedGetter(self, _cx: *mut JSContext, name: DOMString, found: &mut bool) + fn NamedGetter(&self, _cx: *mut JSContext, name: DOMString, found: &mut bool) -> *mut JSObject { #[derive(JSTraceable, HeapSizeOf)] struct NamedElementFilter { @@ -1826,23 +1826,23 @@ impl<'a> DocumentMethods for &'a Document { } // https://html.spec.whatwg.org/multipage/#document - fn SupportedPropertyNames(self) -> Vec<DOMString> { + fn SupportedPropertyNames(&self) -> Vec<DOMString> { // FIXME: unimplemented (https://github.com/servo/servo/issues/7273) vec![] } // https://html.spec.whatwg.org/multipage/#dom-document-clear - fn Clear(self) { + fn Clear(&self) { // This method intentionally does nothing } // https://html.spec.whatwg.org/multipage/#dom-document-captureevents - fn CaptureEvents(self) { + fn CaptureEvents(&self) { // This method intentionally does nothing } // https://html.spec.whatwg.org/#dom-document-releaseevents - fn ReleaseEvents(self) { + fn ReleaseEvents(&self) { // This method intentionally does nothing } diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 367628b669f..2f0ccecda5c 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -51,46 +51,46 @@ impl DocumentFragment { } } -impl<'a> DocumentFragmentMethods for &'a DocumentFragment { +impl DocumentFragmentMethods for DocumentFragment { // https://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(self) -> Root<HTMLCollection> { + fn Children(&self) -> Root<HTMLCollection> { let window = window_from_node(self); HTMLCollection::children(window.r(), NodeCast::from_ref(self)) } // https://dom.spec.whatwg.org/#dom-parentnode-firstelementchild - fn GetFirstElementChild(self) -> Option<Root<Element>> { + fn GetFirstElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).child_elements().next() } // https://dom.spec.whatwg.org/#dom-parentnode-lastelementchild - fn GetLastElementChild(self) -> Option<Root<Element>> { + fn GetLastElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).rev_children().filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-parentnode-childelementcount - fn ChildElementCount(self) -> u32 { + fn ChildElementCount(&self) -> u32 { NodeCast::from_ref(self).child_elements().count() as u32 } // https://dom.spec.whatwg.org/#dom-parentnode-prepend - fn Prepend(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Prepend(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).prepend(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-append - fn Append(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Append(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).append(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { + fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Root<NodeList>> { + fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Root<NodeList>> { let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index c7f7aa9af93..265c918b466 100644 --- a/components/script/dom/documenttype.rs +++ b/components/script/dom/documenttype.rs @@ -73,39 +73,39 @@ impl DocumentType { } } -impl<'a> DocumentTypeMethods for &'a DocumentType { +impl DocumentTypeMethods for DocumentType { // https://dom.spec.whatwg.org/#dom-documenttype-name - fn Name(self) -> DOMString { + fn Name(&self) -> DOMString { self.name.clone() } // https://dom.spec.whatwg.org/#dom-documenttype-publicid - fn PublicId(self) -> DOMString { + fn PublicId(&self) -> DOMString { self.public_id.clone() } // https://dom.spec.whatwg.org/#dom-documenttype-systemid - fn SystemId(self) -> DOMString { + fn SystemId(&self) -> DOMString { self.system_id.clone() } // https://dom.spec.whatwg.org/#dom-childnode-before - fn Before(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Before(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).before(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-after - fn After(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn After(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).after(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-replacewith - fn ReplaceWith(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn ReplaceWith(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).replace_with(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(self) { + fn Remove(&self) { let node = NodeCast::from_ref(self); node.remove_self(); } diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 6bf97a457fc..fdc4257a40d 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -59,9 +59,9 @@ impl DOMException { } } -impl<'a> DOMExceptionMethods for &'a DOMException { +impl DOMExceptionMethods for DOMException { // https://heycam.github.io/webidl/#dfn-DOMException - fn Code(self) -> u16 { + fn Code(&self) -> u16 { match self.code { // https://heycam.github.io/webidl/#dfn-throw DOMErrorName::EncodingError => 0, @@ -70,12 +70,12 @@ impl<'a> DOMExceptionMethods for &'a DOMException { } // https://heycam.github.io/webidl/#idl-DOMException-error-names - fn Name(self) -> DOMString { + fn Name(&self) -> DOMString { format!("{:?}", self.code) } // https://heycam.github.io/webidl/#error-names - fn Message(self) -> DOMString { + fn Message(&self) -> DOMString { let message = match self.code { DOMErrorName::IndexSizeError => "The index is not in the allowed range.", DOMErrorName::HierarchyRequestError => "The operation would yield an incorrect node tree.", diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index cd4b59c7d62..91b97487b4f 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -49,9 +49,9 @@ impl DOMImplementation { } // https://dom.spec.whatwg.org/#domimplementation -impl<'a> DOMImplementationMethods for &'a DOMImplementation { +impl DOMImplementationMethods for DOMImplementation { // https://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype - fn CreateDocumentType(self, qualified_name: DOMString, pubid: DOMString, sysid: DOMString) + fn CreateDocumentType(&self, qualified_name: DOMString, pubid: DOMString, sysid: DOMString) -> Fallible<Root<DocumentType>> { try!(validate_qualified_name(&qualified_name)); let document = self.document.root(); @@ -59,7 +59,7 @@ impl<'a> DOMImplementationMethods for &'a DOMImplementation { } // https://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<&DocumentType>) -> Fallible<Root<Document>> { let doc = self.document.root(); let doc = doc.r(); @@ -108,7 +108,7 @@ impl<'a> DOMImplementationMethods for &'a DOMImplementation { } // https://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument - fn CreateHTMLDocument(self, title: Option<DOMString>) -> Root<Document> { + fn CreateHTMLDocument(&self, title: Option<DOMString>) -> Root<Document> { let document = self.document.root(); let document = document.r(); let win = document.window(); @@ -167,7 +167,7 @@ impl<'a> DOMImplementationMethods for &'a DOMImplementation { } // https://dom.spec.whatwg.org/#dom-domimplementation-hasfeature - fn HasFeature(self) -> bool { + fn HasFeature(&self) -> bool { true } } diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 4c7b1c82630..00172fc398d 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -44,9 +44,9 @@ impl DOMParser { } } -impl<'a> DOMParserMethods for &'a DOMParser { +impl DOMParserMethods for DOMParser { // https://domparsing.spec.whatwg.org/#the-domparser-interface - fn ParseFromString(self, + fn ParseFromString(&self, s: DOMString, ty: DOMParserBinding::SupportedType) -> Fallible<Root<Document>> { diff --git a/components/script/dom/dompoint.rs b/components/script/dom/dompoint.rs index f4291a271e3..1f8e85f50ad 100644 --- a/components/script/dom/dompoint.rs +++ b/components/script/dom/dompoint.rs @@ -33,44 +33,44 @@ impl DOMPoint { } } -impl<'a> DOMPointMethods for &'a DOMPoint { +impl DOMPointMethods for DOMPoint { // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x - fn X(self) -> f64 { + fn X(&self) -> f64 { self.point.X() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x - fn SetX(self, value: f64) { + fn SetX(&self, value: f64) { self.point.SetX(value); } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y - fn Y(self) -> f64 { + fn Y(&self) -> f64 { self.point.Y() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y - fn SetY(self, value: f64) { + fn SetY(&self, value: f64) { self.point.SetY(value); } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z - fn Z(self) -> f64 { + fn Z(&self) -> f64 { self.point.Z() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z - fn SetZ(self, value: f64) { + fn SetZ(&self, value: f64) { self.point.SetZ(value); } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w - fn W(self) -> f64 { + fn W(&self) -> f64 { self.point.W() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w - fn SetW(self, value: f64) { + fn SetW(&self, value: f64) { self.point.SetW(value); } } diff --git a/components/script/dom/dompointreadonly.rs b/components/script/dom/dompointreadonly.rs index b0a3d33f5e1..fd4965402cf 100644 --- a/components/script/dom/dompointreadonly.rs +++ b/components/script/dom/dompointreadonly.rs @@ -40,49 +40,49 @@ impl DOMPointReadOnly { } } -impl<'a> DOMPointReadOnlyMethods for &'a DOMPointReadOnly { +impl DOMPointReadOnlyMethods for DOMPointReadOnly { // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-x - fn X(self) -> f64 { + fn X(&self) -> f64 { self.x.get() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-y - fn Y(self) -> f64 { + fn Y(&self) -> f64 { self.y.get() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-z - fn Z(self) -> f64 { + fn Z(&self) -> f64 { self.z.get() } // https://dev.w3.org/fxtf/geometry/Overview.html#dom-dompointreadonly-w - fn W(self) -> f64 { + fn W(&self) -> f64 { self.w.get() } } pub trait DOMPointWriteMethods { - fn SetX(self, value: f64); - fn SetY(self, value: f64); - fn SetZ(self, value: f64); - fn SetW(self, value: f64); + fn SetX(&self, value: f64); + fn SetY(&self, value: f64); + fn SetZ(&self, value: f64); + fn SetW(&self, value: f64); } -impl<'a> DOMPointWriteMethods for &'a DOMPointReadOnly { - fn SetX(self, value: f64) { +impl DOMPointWriteMethods for DOMPointReadOnly { + fn SetX(&self, value: f64) { self.x.set(value); } - fn SetY(self, value: f64) { + fn SetY(&self, value: f64) { self.y.set(value); } - fn SetZ(self, value: f64) { + fn SetZ(&self, value: f64) { self.z.set(value); } - fn SetW(self, value: f64) { + fn SetW(&self, value: f64) { self.w.set(value); } } diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index c2936217c94..b2b701e8fc1 100644 --- a/components/script/dom/domrect.rs +++ b/components/script/dom/domrect.rs @@ -40,35 +40,35 @@ impl DOMRect { } } -impl<'a> DOMRectMethods for &'a DOMRect { +impl DOMRectMethods for DOMRect { // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-top - fn Top(self) -> Finite<f32> { + fn Top(&self) -> Finite<f32> { Finite::wrap(self.top) } // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-bottom - fn Bottom(self) -> Finite<f32> { + fn Bottom(&self) -> Finite<f32> { Finite::wrap(self.bottom) } // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-left - fn Left(self) -> Finite<f32> { + fn Left(&self) -> Finite<f32> { Finite::wrap(self.left) } // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-right - fn Right(self) -> Finite<f32> { + fn Right(&self) -> Finite<f32> { Finite::wrap(self.right) } // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-width - fn Width(self) -> Finite<f32> { + fn Width(&self) -> Finite<f32> { let result = (self.right - self.left).abs(); Finite::wrap(result) } // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-height - fn Height(self) -> Finite<f32> { + fn Height(&self) -> Finite<f32> { let result = (self.bottom - self.top).abs(); Finite::wrap(result) } diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs index 2efeb9d1587..cd67dbc28c7 100644 --- a/components/script/dom/domrectlist.rs +++ b/components/script/dom/domrectlist.rs @@ -32,14 +32,14 @@ impl DOMRectList { } } -impl<'a> DOMRectListMethods for &'a DOMRectList { +impl DOMRectListMethods for DOMRectList { // https://drafts.fxtf.org/geometry/#dom-domrectlist-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { self.rects.len() as u32 } // https://drafts.fxtf.org/geometry/#dom-domrectlist-item - fn Item(self, index: u32) -> Option<Root<DOMRect>> { + fn Item(&self, index: u32) -> Option<Root<DOMRect>> { let rects = &self.rects; if index < rects.len() as u32 { Some(rects[index as usize].root()) @@ -49,7 +49,7 @@ impl<'a> DOMRectListMethods for &'a DOMRectList { } // check-tidy: no specs after this line - fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<DOMRect>> { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Root<DOMRect>> { *found = index < self.rects.len() as u32; self.Item(index) } diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs index a26ef3f9bbc..112fb42ca32 100644 --- a/components/script/dom/domstringmap.rs +++ b/components/script/dom/domstringmap.rs @@ -34,26 +34,26 @@ impl DOMStringMap { } // https://html.spec.whatwg.org/#domstringmap -impl<'a> DOMStringMapMethods for &'a DOMStringMap { +impl DOMStringMapMethods for DOMStringMap { // https://html.spec.whatwg.org/multipage/#dom-domstringmap-additem - fn NamedCreator(self, name: DOMString, value: DOMString) -> ErrorResult { + fn NamedCreator(&self, name: DOMString, value: DOMString) -> ErrorResult { self.NamedSetter(name, value) } // https://html.spec.whatwg.org/multipage/#dom-domstringmap-removeitem - fn NamedDeleter(self, name: DOMString) { + fn NamedDeleter(&self, name: DOMString) { let element = self.element.root(); element.r().delete_custom_attr(name) } // https://html.spec.whatwg.org/multipage/#dom-domstringmap-setitem - fn NamedSetter(self, name: DOMString, value: DOMString) -> ErrorResult { + fn NamedSetter(&self, name: DOMString, value: DOMString) -> ErrorResult { let element = self.element.root(); element.r().set_custom_attr(name, value) } // https://html.spec.whatwg.org/multipage/#dom-domstringmap-nameditem - fn NamedGetter(self, name: DOMString, found: &mut bool) -> DOMString { + fn NamedGetter(&self, name: DOMString, found: &mut bool) -> DOMString { let element = self.element.root(); match element.r().get_custom_attr(name) { Some(value) => { @@ -68,7 +68,7 @@ impl<'a> DOMStringMapMethods for &'a DOMStringMap { } // https://html.spec.whatwg.org/multipage/#domstringmap - fn SupportedPropertyNames(self) -> Vec<DOMString> { + fn SupportedPropertyNames(&self) -> Vec<DOMString> { // FIXME: unimplemented (https://github.com/servo/servo/issues/7273) vec![] } diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 5fb08697302..8e9a482f616 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -59,9 +59,9 @@ impl DOMTokenList { } // https://dom.spec.whatwg.org/#domtokenlist -impl<'a> DOMTokenListMethods for &'a DOMTokenList { +impl DOMTokenListMethods for DOMTokenList { // https://dom.spec.whatwg.org/#dom-domtokenlist-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { self.attribute().map(|attr| { let attr = attr.r(); attr.value().tokens().map(|tokens| tokens.len()).unwrap_or(0) @@ -69,7 +69,7 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://dom.spec.whatwg.org/#dom-domtokenlist-item - fn Item(self, index: u32) -> Option<DOMString> { + fn Item(&self, index: u32) -> Option<DOMString> { self.attribute().and_then(|attr| { let attr = attr.r(); attr.value().tokens().and_then(|tokens| { @@ -79,7 +79,7 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://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).map(|token| { self.attribute().map(|attr| { let attr = attr.r(); @@ -93,7 +93,7 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://dom.spec.whatwg.org/#dom-domtokenlist-add - fn Add(self, tokens: Vec<DOMString>) -> ErrorResult { + fn Add(&self, tokens: Vec<DOMString>) -> ErrorResult { let element = self.element.root(); let mut atoms = element.r().get_tokenlist_attribute(&self.local_name); for token in &tokens { @@ -107,7 +107,7 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://dom.spec.whatwg.org/#dom-domtokenlist-remove - fn Remove(self, tokens: Vec<DOMString>) -> ErrorResult { + fn Remove(&self, tokens: Vec<DOMString>) -> ErrorResult { let element = self.element.root(); let mut atoms = element.r().get_tokenlist_attribute(&self.local_name); for token in &tokens { @@ -121,7 +121,7 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://dom.spec.whatwg.org/#dom-domtokenlist-toggle - fn Toggle(self, token: DOMString, force: Option<bool>) -> Fallible<bool> { + fn Toggle(&self, token: DOMString, force: Option<bool>) -> Fallible<bool> { let element = self.element.root(); let mut atoms = element.r().get_tokenlist_attribute(&self.local_name); let token = try!(self.check_token_exceptions(&token)); @@ -146,13 +146,13 @@ impl<'a> DOMTokenListMethods for &'a DOMTokenList { } // https://dom.spec.whatwg.org/#stringification-behavior - fn Stringifier(self) -> DOMString { + fn Stringifier(&self) -> DOMString { let tokenlist = self.element.root().r().get_tokenlist_attribute(&self.local_name); str_join(&tokenlist, "\x20") } // check-tidy: no specs after this line - 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 diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 21d0a5490cb..83b7c24ed3a 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -1089,24 +1089,24 @@ impl Element { } } -impl<'a> ElementMethods for &'a Element { +impl ElementMethods for Element { // https://dom.spec.whatwg.org/#dom-element-namespaceuri - fn GetNamespaceURI(self) -> Option<DOMString> { + fn GetNamespaceURI(&self) -> Option<DOMString> { Node::namespace_to_string(self.namespace.clone()) } // https://dom.spec.whatwg.org/#dom-element-localname - fn LocalName(self) -> DOMString { + fn LocalName(&self) -> DOMString { (*self.local_name).to_owned() } // https://dom.spec.whatwg.org/#dom-element-prefix - fn GetPrefix(self) -> Option<DOMString> { + fn GetPrefix(&self) -> Option<DOMString> { self.prefix.clone() } // https://dom.spec.whatwg.org/#dom-element-tagname - fn TagName(self) -> DOMString { + fn TagName(&self) -> DOMString { let qualified_name = match self.prefix { Some(ref prefix) => { Cow::Owned(format!("{}:{}", &**prefix, &*self.local_name)) @@ -1121,32 +1121,32 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-id - fn Id(self) -> DOMString { + fn Id(&self) -> DOMString { self.get_string_attribute(&atom!("id")) } // https://dom.spec.whatwg.org/#dom-element-id - fn SetId(self, id: DOMString) { + fn SetId(&self, id: DOMString) { self.set_atomic_attribute(&atom!("id"), id); } // https://dom.spec.whatwg.org/#dom-element-classname - fn ClassName(self) -> DOMString { + fn ClassName(&self) -> DOMString { self.get_string_attribute(&atom!("class")) } // https://dom.spec.whatwg.org/#dom-element-classname - fn SetClassName(self, class: DOMString) { + fn SetClassName(&self, class: DOMString) { self.set_tokenlist_attribute(&atom!("class"), class); } // https://dom.spec.whatwg.org/#dom-element-classlist - fn ClassList(self) -> Root<DOMTokenList> { + fn ClassList(&self) -> Root<DOMTokenList> { self.class_list.or_init(|| DOMTokenList::new(self, &atom!("class"))) } // https://dom.spec.whatwg.org/#dom-element-attributes - fn Attributes(self) -> Root<NamedNodeMap> { + fn Attributes(&self) -> Root<NamedNodeMap> { self.attr_list.or_init(|| { let doc = { let node = NodeCast::from_ref(self); @@ -1158,13 +1158,13 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-getattribute - fn GetAttribute(self, name: DOMString) -> Option<DOMString> { + fn GetAttribute(&self, name: DOMString) -> Option<DOMString> { self.get_attribute_by_name(name) .map(|s| s.r().Value()) } // https://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_domstring(namespace); @@ -1173,7 +1173,7 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-setattribute - fn SetAttribute(self, + fn SetAttribute(&self, name: DOMString, value: DOMString) -> ErrorResult { // Step 1. @@ -1193,7 +1193,7 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-setattributens - fn SetAttributeNS(self, + fn SetAttributeNS(&self, namespace: Option<DOMString>, qualified_name: DOMString, value: DOMString) -> ErrorResult { @@ -1210,13 +1210,13 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-removeattribute - fn RemoveAttribute(self, name: DOMString) { + fn RemoveAttribute(&self, name: DOMString) { let name = self.parsed_name(name); self.remove_attribute_by_name(&name); } // https://dom.spec.whatwg.org/#dom-element-removeattributens - fn RemoveAttributeNS(self, + fn RemoveAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) { let namespace = namespace_from_domstring(namespace); @@ -1225,38 +1225,38 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-hasattribute - fn HasAttribute(self, name: DOMString) -> bool { + fn HasAttribute(&self, name: DOMString) -> bool { self.GetAttribute(name).is_some() } // https://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() } // https://dom.spec.whatwg.org/#dom-element-getelementsbytagname - fn GetElementsByTagName(self, localname: DOMString) -> Root<HTMLCollection> { + fn GetElementsByTagName(&self, localname: DOMString) -> Root<HTMLCollection> { let window = window_from_node(self); HTMLCollection::by_tag_name(window.r(), NodeCast::from_ref(self), localname) } // https://dom.spec.whatwg.org/#dom-element-getelementsbytagnamens - fn GetElementsByTagNameNS(self, maybe_ns: Option<DOMString>, + fn GetElementsByTagNameNS(&self, maybe_ns: Option<DOMString>, localname: DOMString) -> Root<HTMLCollection> { let window = window_from_node(self); HTMLCollection::by_tag_name_ns(window.r(), NodeCast::from_ref(self), localname, maybe_ns) } // https://dom.spec.whatwg.org/#dom-element-getelementsbyclassname - fn GetElementsByClassName(self, classes: DOMString) -> Root<HTMLCollection> { + fn GetElementsByClassName(&self, classes: DOMString) -> Root<HTMLCollection> { let window = window_from_node(self); HTMLCollection::by_class_name(window.r(), NodeCast::from_ref(self), classes) } // https://drafts.csswg.org/cssom-view/#dom-element-getclientrects - fn GetClientRects(self) -> Root<DOMRectList> { + fn GetClientRects(&self) -> Root<DOMRectList> { let win = window_from_node(self); let node = NodeCast::from_ref(self); let raw_rects = node.get_content_boxes(); @@ -1269,7 +1269,7 @@ impl<'a> ElementMethods for &'a Element { } // https://drafts.csswg.org/cssom-view/#dom-element-getboundingclientrect - fn GetBoundingClientRect(self) -> Root<DOMRect> { + fn GetBoundingClientRect(&self) -> Root<DOMRect> { let win = window_from_node(self); let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); @@ -1282,37 +1282,37 @@ impl<'a> ElementMethods for &'a Element { } // https://drafts.csswg.org/cssom-view/#dom-element-clienttop - fn ClientTop(self) -> i32 { + fn ClientTop(&self) -> i32 { let node = NodeCast::from_ref(self); node.get_client_rect().origin.y } // https://drafts.csswg.org/cssom-view/#dom-element-clientleft - fn ClientLeft(self) -> i32 { + fn ClientLeft(&self) -> i32 { let node = NodeCast::from_ref(self); node.get_client_rect().origin.x } // https://drafts.csswg.org/cssom-view/#dom-element-clientwidth - fn ClientWidth(self) -> i32 { + fn ClientWidth(&self) -> i32 { let node = NodeCast::from_ref(self); node.get_client_rect().size.width } // https://drafts.csswg.org/cssom-view/#dom-element-clientheight - fn ClientHeight(self) -> i32 { + fn ClientHeight(&self) -> i32 { let node = NodeCast::from_ref(self); node.get_client_rect().size.height } // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-innerHTML - fn GetInnerHTML(self) -> Fallible<DOMString> { + fn GetInnerHTML(&self) -> Fallible<DOMString> { //XXX TODO: XML case self.serialize(ChildrenOnly) } // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-innerHTML - fn SetInnerHTML(self, value: DOMString) -> Fallible<()> { + fn SetInnerHTML(&self, value: DOMString) -> Fallible<()> { let context_node = NodeCast::from_ref(self); // Step 1. let frag = try!(context_node.parse_fragment(value)); @@ -1322,12 +1322,12 @@ impl<'a> ElementMethods for &'a Element { } // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-outerHTML - fn GetOuterHTML(self) -> Fallible<DOMString> { + fn GetOuterHTML(&self) -> Fallible<DOMString> { self.serialize(IncludeNode) } // https://dvcs.w3.org/hg/innerhtml/raw-file/tip/index.html#widl-Element-outerHTML - fn SetOuterHTML(self, value: DOMString) -> Fallible<()> { + fn SetOuterHTML(&self, value: DOMString) -> Fallible<()> { let context_document = document_from_node(self); let context_node = NodeCast::from_ref(self); // Step 1. @@ -1362,83 +1362,83 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling - fn GetPreviousElementSibling(self) -> Option<Root<Element>> { + fn GetPreviousElementSibling(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).preceding_siblings() .filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-nextelementsibling - fn GetNextElementSibling(self) -> Option<Root<Element>> { + fn GetNextElementSibling(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).following_siblings() .filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-parentnode-children - fn Children(self) -> Root<HTMLCollection> { + fn Children(&self) -> Root<HTMLCollection> { let window = window_from_node(self); HTMLCollection::children(window.r(), NodeCast::from_ref(self)) } // https://dom.spec.whatwg.org/#dom-parentnode-firstelementchild - fn GetFirstElementChild(self) -> Option<Root<Element>> { + fn GetFirstElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).child_elements().next() } // https://dom.spec.whatwg.org/#dom-parentnode-lastelementchild - fn GetLastElementChild(self) -> Option<Root<Element>> { + fn GetLastElementChild(&self) -> Option<Root<Element>> { NodeCast::from_ref(self).rev_children().filter_map(ElementCast::to_root).next() } // https://dom.spec.whatwg.org/#dom-parentnode-childelementcount - fn ChildElementCount(self) -> u32 { + fn ChildElementCount(&self) -> u32 { NodeCast::from_ref(self).child_elements().count() as u32 } // https://dom.spec.whatwg.org/#dom-parentnode-prepend - fn Prepend(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Prepend(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).prepend(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-append - fn Append(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Append(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).append(nodes) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselector - fn QuerySelector(self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { + fn QuerySelector(&self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { let root = NodeCast::from_ref(self); root.query_selector(selectors) } // https://dom.spec.whatwg.org/#dom-parentnode-queryselectorall - fn QuerySelectorAll(self, selectors: DOMString) -> Fallible<Root<NodeList>> { + fn QuerySelectorAll(&self, selectors: DOMString) -> Fallible<Root<NodeList>> { let root = NodeCast::from_ref(self); root.query_selector_all(selectors) } // https://dom.spec.whatwg.org/#dom-childnode-before - fn Before(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn Before(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).before(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-after - fn After(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn After(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).after(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-replacewith - fn ReplaceWith(self, nodes: Vec<NodeOrString>) -> ErrorResult { + fn ReplaceWith(&self, nodes: Vec<NodeOrString>) -> ErrorResult { NodeCast::from_ref(self).replace_with(nodes) } // https://dom.spec.whatwg.org/#dom-childnode-remove - fn Remove(self) { + fn Remove(&self) { let node = NodeCast::from_ref(self); node.remove_self(); } // https://dom.spec.whatwg.org/#dom-element-matches - fn Matches(self, selectors: DOMString) -> Fallible<bool> { + fn Matches(&self, selectors: DOMString) -> Fallible<bool> { match parse_author_origin_selector_list_from_str(&selectors) { Err(()) => Err(Syntax), Ok(ref selectors) => { @@ -1448,7 +1448,7 @@ impl<'a> ElementMethods for &'a Element { } // https://dom.spec.whatwg.org/#dom-element-closest - fn Closest(self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { + fn Closest(&self, selectors: DOMString) -> Fallible<Option<Root<Element>>> { match parse_author_origin_selector_list_from_str(&selectors) { Err(()) => Err(Syntax), Ok(ref selectors) => { diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index 3c465e472f1..af28a44d0dc 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -114,29 +114,29 @@ impl ErrorEvent { } -impl<'a> ErrorEventMethods for &'a ErrorEvent { +impl ErrorEventMethods for ErrorEvent { // https://html.spec.whatwg.org/multipage/#dom-errorevent-lineno - fn Lineno(self) -> u32 { + fn Lineno(&self) -> u32 { self.lineno.get() } // https://html.spec.whatwg.org/multipage/#dom-errorevent-colno - fn Colno(self) -> u32 { + fn Colno(&self) -> u32 { self.colno.get() } // https://html.spec.whatwg.org/multipage/#dom-errorevent-message - fn Message(self) -> DOMString { + fn Message(&self) -> DOMString { self.message.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-errorevent-filename - fn Filename(self) -> DOMString { + fn Filename(&self) -> DOMString { self.filename.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-errorevent-error - fn Error(self, _cx: *mut JSContext) -> JSVal { + fn Error(&self, _cx: *mut JSContext) -> JSVal { self.error.get() } diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 320486cf1db..58b45932cd8 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -172,67 +172,67 @@ impl Event { } } -impl<'a> EventMethods for &'a Event { +impl EventMethods for Event { // https://dom.spec.whatwg.org/#dom-event-eventphase - fn EventPhase(self) -> u16 { + fn EventPhase(&self) -> u16 { self.phase.get() as u16 } // https://dom.spec.whatwg.org/#dom-event-type - fn Type(self) -> DOMString { + fn Type(&self) -> DOMString { self.type_.borrow().clone() } // https://dom.spec.whatwg.org/#dom-event-target - fn GetTarget(self) -> Option<Root<EventTarget>> { + fn GetTarget(&self) -> Option<Root<EventTarget>> { self.target.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-event-currenttarget - fn GetCurrentTarget(self) -> Option<Root<EventTarget>> { + fn GetCurrentTarget(&self) -> Option<Root<EventTarget>> { self.current_target.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-event-defaultprevented - fn DefaultPrevented(self) -> bool { + fn DefaultPrevented(&self) -> bool { self.canceled.get() } // https://dom.spec.whatwg.org/#dom-event-preventdefault - fn PreventDefault(self) { + fn PreventDefault(&self) { if self.cancelable.get() { self.canceled.set(true) } } // https://dom.spec.whatwg.org/#dom-event-stoppropagation - fn StopPropagation(self) { + fn StopPropagation(&self) { self.stop_propagation.set(true); } // https://dom.spec.whatwg.org/#dom-event-stopimmediatepropagation - fn StopImmediatePropagation(self) { + fn StopImmediatePropagation(&self) { self.stop_immediate.set(true); self.stop_propagation.set(true); } // https://dom.spec.whatwg.org/#dom-event-bubbles - fn Bubbles(self) -> bool { + fn Bubbles(&self) -> bool { self.bubbles.get() } // https://dom.spec.whatwg.org/#dom-event-cancelable - fn Cancelable(self) -> bool { + fn Cancelable(&self) -> bool { self.cancelable.get() } // https://dom.spec.whatwg.org/#dom-event-timestamp - fn TimeStamp(self) -> u64 { + fn TimeStamp(&self) -> u64 { self.timestamp } // https://dom.spec.whatwg.org/#dom-event-initevent - fn InitEvent(self, + fn InitEvent(&self, type_: DOMString, bubbles: bool, cancelable: bool) { @@ -252,7 +252,7 @@ impl<'a> EventMethods for &'a Event { } // https://dom.spec.whatwg.org/#dom-event-istrusted - fn IsTrusted(self) -> bool { + fn IsTrusted(&self) -> bool { self.trusted.get() } } diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index ed50a6b0fa9..34fe75a3fc0 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -284,9 +284,9 @@ impl EventTarget { } } -impl<'a> EventTargetMethods for &'a EventTarget { +impl EventTargetMethods for EventTarget { // https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener - fn AddEventListener(self, + fn AddEventListener(&self, ty: DOMString, listener: Option<Rc<EventListener>>, capture: bool) { @@ -312,7 +312,7 @@ impl<'a> EventTargetMethods for &'a EventTarget { } // https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener - fn RemoveEventListener(self, + fn RemoveEventListener(&self, ty: DOMString, listener: Option<Rc<EventListener>>, capture: bool) { @@ -336,7 +336,7 @@ impl<'a> EventTargetMethods for &'a EventTarget { } // https://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent - fn DispatchEvent(self, event: &Event) -> Fallible<bool> { + fn DispatchEvent(&self, event: &Event) -> Fallible<bool> { if event.dispatching() || !event.initialized() { return Err(InvalidState); } diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index d94377489f5..8da50b26b13 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -39,9 +39,9 @@ impl File { } } -impl<'a> FileMethods for &'a File { +impl FileMethods for File { // https://w3c.github.io/FileAPI/#dfn-name - fn Name(self) -> DOMString { + fn Name(&self) -> DOMString { self.name.clone() } } diff --git a/components/script/dom/filelist.rs b/components/script/dom/filelist.rs index 6da842ea076..57542b0a51d 100644 --- a/components/script/dom/filelist.rs +++ b/components/script/dom/filelist.rs @@ -30,19 +30,19 @@ impl FileList { } } -impl<'a> FileListMethods for &'a FileList { +impl FileListMethods for FileList { // https://w3c.github.io/FileAPI/#dfn-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { self.list.len() as u32 } // https://w3c.github.io/FileAPI/#dfn-item - fn Item(self, index: u32) -> Option<Root<File>> { + fn Item(&self, index: u32) -> Option<Root<File>> { Some(self.list[index as usize].root()) } // check-tidy: no specs after this line - fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<File>> { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Root<File>> { let item = self.Item(index); *found = item.is_some(); item diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 327b75c9b99..363e4acbdc5 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -251,7 +251,7 @@ impl FileReader { } } -impl<'a> FileReaderMethods for &'a FileReader { +impl FileReaderMethods for FileReader { event_handler!(loadstart, GetOnloadstart, SetOnloadstart); event_handler!(progress, GetOnprogress, SetOnprogress); event_handler!(load, GetOnload, SetOnload); @@ -261,17 +261,17 @@ impl<'a> FileReaderMethods for &'a FileReader { //TODO https://w3c.github.io/FileAPI/#dfn-readAsArrayBuffer // https://w3c.github.io/FileAPI/#dfn-readAsDataURL - fn ReadAsDataURL(self, blob: &Blob) -> ErrorResult { + fn ReadAsDataURL(&self, blob: &Blob) -> ErrorResult { self.read(FileReaderFunction::ReadAsDataUrl, blob, None) } // https://w3c.github.io/FileAPI/#dfn-readAsText - fn ReadAsText(self, blob: &Blob, label: Option<DOMString>) -> ErrorResult { + fn ReadAsText(&self, blob: &Blob, label: Option<DOMString>) -> ErrorResult { self.read(FileReaderFunction::ReadAsText, blob, label) } // https://w3c.github.io/FileAPI/#dfn-abort - fn Abort(self) { + fn Abort(&self) { // Step 2 if self.ready_state.get() == FileReaderReadyState::Loading { self.change_ready_state(FileReaderReadyState::Done); @@ -290,17 +290,17 @@ impl<'a> FileReaderMethods for &'a FileReader { } // https://w3c.github.io/FileAPI/#dfn-error - fn GetError(self) -> Option<Root<DOMException>> { + fn GetError(&self) -> Option<Root<DOMException>> { self.error.get().map(|error| error.root()) } // https://w3c.github.io/FileAPI/#dfn-result - fn GetResult(self) -> Option<DOMString> { + fn GetResult(&self) -> Option<DOMString> { self.result.borrow().clone() } // https://w3c.github.io/FileAPI/#dfn-readyState - fn ReadyState(self) -> u16 { + fn ReadyState(&self) -> u16 { self.ready_state.get() as u16 } } diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index c2b144f911e..8390430c39e 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -57,10 +57,10 @@ impl FormData { } } -impl<'a> FormDataMethods for &'a FormData { +impl FormDataMethods for FormData { #[allow(unrooted_must_root)] // https://xhr.spec.whatwg.org/#dom-formdata-append - fn Append(self, name: DOMString, value: &Blob, filename: Option<DOMString>) { + fn Append(&self, name: DOMString, value: &Blob, filename: Option<DOMString>) { let file = FormDatum::FileData(JS::from_rooted(&self.get_file_from_blob(value, filename))); let mut data = self.data.borrow_mut(); match data.entry(name) { @@ -72,7 +72,7 @@ impl<'a> FormDataMethods for &'a FormData { } // https://xhr.spec.whatwg.org/#dom-formdata-append - fn Append_(self, name: DOMString, value: DOMString) { + fn Append_(&self, name: DOMString, value: DOMString) { let mut data = self.data.borrow_mut(); match data.entry(name) { Occupied(entry) => entry.into_mut().push(FormDatum::StringData(value)), @@ -81,13 +81,13 @@ impl<'a> FormDataMethods for &'a FormData { } // https://xhr.spec.whatwg.org/#dom-formdata-delete - fn Delete(self, name: DOMString) { + fn Delete(&self, name: DOMString) { self.data.borrow_mut().remove(&name); } #[allow(unsafe_code)] // https://xhr.spec.whatwg.org/#dom-formdata-get - fn Get(self, name: DOMString) -> Option<FileOrString> { + fn Get(&self, name: DOMString) -> Option<FileOrString> { // FIXME(https://github.com/rust-lang/rust/issues/23338) let data = self.data.borrow(); if data.contains_key(&name) { @@ -103,18 +103,18 @@ impl<'a> FormDataMethods for &'a FormData { } // https://xhr.spec.whatwg.org/#dom-formdata-has - fn Has(self, name: DOMString) -> bool { + fn Has(&self, name: DOMString) -> bool { self.data.borrow().contains_key(&name) } // https://xhr.spec.whatwg.org/#dom-formdata-set - fn Set_(self, name: DOMString, value: DOMString) { + fn Set_(&self, name: DOMString, value: DOMString) { self.data.borrow_mut().insert(name, vec!(FormDatum::StringData(value))); } #[allow(unrooted_must_root)] // https://xhr.spec.whatwg.org/#dom-formdata-set - fn Set(self, name: DOMString, value: &Blob, filename: Option<DOMString>) { + fn Set(&self, name: DOMString, value: &Blob, filename: Option<DOMString>) { let file = FormDatum::FileData(JS::from_rooted(&self.get_file_from_blob(value, filename))); self.data.borrow_mut().insert(name, vec!(file)); } diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 83cf873e7e9..67daf4e6df4 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -79,21 +79,21 @@ impl VirtualMethods for HTMLAnchorElement { } } -impl<'a> HTMLAnchorElementMethods for &'a HTMLAnchorElement { +impl HTMLAnchorElementMethods for HTMLAnchorElement { // https://html.spec.whatwg.org/multipage/#dom-a-text - fn Text(self) -> DOMString { + fn Text(&self) -> DOMString { let node = NodeCast::from_ref(self); node.GetTextContent().unwrap() } // https://html.spec.whatwg.org/multipage/#dom-a-text - fn SetText(self, value: DOMString) { + fn SetText(&self, value: DOMString) { let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } // https://html.spec.whatwg.org/multipage/#dom-a-rellist - fn RelList(self) -> Root<DOMTokenList> { + fn RelList(&self) -> Root<DOMTokenList> { self.rel_list.or_init(|| { DOMTokenList::new(ElementCast::from_ref(self), &atom!("rel")) }) diff --git a/components/script/dom/htmlappletelement.rs b/components/script/dom/htmlappletelement.rs index ddc718477b3..a3cb281497b 100644 --- a/components/script/dom/htmlappletelement.rs +++ b/components/script/dom/htmlappletelement.rs @@ -51,7 +51,7 @@ impl HTMLAppletElement { } } -impl<'a> HTMLAppletElementMethods for &'a HTMLAppletElement { +impl HTMLAppletElementMethods for HTMLAppletElement { // https://html.spec.whatwg.org/#the-applet-element:dom-applet-name make_getter!(Name); make_atomic_setter!(SetName, "name"); diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index ea5d255cf20..02bd899c86c 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -66,9 +66,9 @@ impl VirtualMethods for HTMLAreaElement { } } -impl<'a> HTMLAreaElementMethods for &'a HTMLAreaElement { +impl HTMLAreaElementMethods for HTMLAreaElement { // https://html.spec.whatwg.org/multipage/#dom-area-rellist - fn RelList(self) -> Root<DOMTokenList> { + fn RelList(&self) -> Root<DOMTokenList> { self.rel_list.or_init(|| { DOMTokenList::new(ElementCast::from_ref(self), &atom!("rel")) }) diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index b63e7428e8a..a38e385bc9c 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -68,19 +68,19 @@ impl HTMLBodyElement { } } -impl<'a> HTMLBodyElementMethods for &'a HTMLBodyElement { +impl HTMLBodyElementMethods for HTMLBodyElement { // https://html.spec.whatwg.org/multipage#dom-body-bgcolor make_getter!(BgColor, "bgcolor"); make_setter!(SetBgColor, "bgcolor"); // https://html.spec.whatwg.org/multipage/#the-body-element - fn GetOnunload(self) -> Option<Rc<EventHandlerNonNull>> { + fn GetOnunload(&self) -> Option<Rc<EventHandlerNonNull>> { let win = window_from_node(self); win.r().GetOnunload() } // https://html.spec.whatwg.org/multipage/#the-body-element - fn SetOnunload(self, listener: Option<Rc<EventHandlerNonNull>>) { + fn SetOnunload(&self, listener: Option<Rc<EventHandlerNonNull>>) { let win = window_from_node(self); win.r().SetOnunload(listener) } diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 9ff0a597657..a8c95eb6d3b 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -70,9 +70,9 @@ impl HTMLButtonElement { } } -impl<'a> HTMLButtonElementMethods for &'a HTMLButtonElement { +impl HTMLButtonElementMethods for HTMLButtonElement { // https://html.spec.whatwg.org/multipage/#dom-cva-validity - fn Validity(self) -> Root<ValidityState> { + fn Validity(&self) -> Root<ValidityState> { let window = window_from_node(self); ValidityState::new(window.r()) } @@ -84,7 +84,7 @@ impl<'a> HTMLButtonElementMethods for &'a HTMLButtonElement { make_bool_setter!(SetDisabled, "disabled"); // https://html.spec.whatwg.org/multipage/#dom-button-type - fn Type(self) -> DOMString { + fn Type(&self) -> DOMString { let elem = ElementCast::from_ref(self); let mut ty = elem.get_string_attribute(&atom!("type")); ty.make_ascii_lowercase(); diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index e0e8e3d2e08..8da4c2cd155 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -205,31 +205,31 @@ impl HTMLCanvasElement { } } -impl<'a> HTMLCanvasElementMethods for &'a HTMLCanvasElement { +impl HTMLCanvasElementMethods for HTMLCanvasElement { // https://html.spec.whatwg.org/multipage/#dom-canvas-width - fn Width(self) -> u32 { + fn Width(&self) -> u32 { self.width.get() } // https://html.spec.whatwg.org/multipage/#dom-canvas-width - fn SetWidth(self, width: u32) { + fn SetWidth(&self, width: u32) { let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("width"), width) } // https://html.spec.whatwg.org/multipage/#dom-canvas-height - fn Height(self) -> u32 { + fn Height(&self) -> u32 { self.height.get() } // https://html.spec.whatwg.org/multipage/#dom-canvas-height - fn SetHeight(self, height: u32) { + fn SetHeight(&self, height: u32) { let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("height"), height) } // https://html.spec.whatwg.org/multipage/#dom-canvas-getcontext - fn GetContext(self, + fn GetContext(&self, cx: *mut JSContext, id: DOMString, attributes: Vec<HandleValue>) diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 19274579eea..eca49ed6f56 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -192,19 +192,19 @@ impl<'a> Iterator for HTMLCollectionElementsIter<'a> { } } -impl<'a> HTMLCollectionMethods for &'a HTMLCollection { +impl HTMLCollectionMethods for HTMLCollection { // https://dom.spec.whatwg.org/#dom-htmlcollection-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { self.elements_iter().count() as u32 } // https://dom.spec.whatwg.org/#dom-htmlcollection-item - fn Item(self, index: u32) -> Option<Root<Element>> { + fn Item(&self, index: u32) -> Option<Root<Element>> { self.elements_iter().nth(index as usize) } // https://dom.spec.whatwg.org/#dom-htmlcollection-nameditem - fn NamedItem(self, key: DOMString) -> Option<Root<Element>> { + fn NamedItem(&self, key: DOMString) -> Option<Root<Element>> { // Step 1. if key.is_empty() { return None; @@ -218,21 +218,21 @@ impl<'a> HTMLCollectionMethods for &'a HTMLCollection { } // https://dom.spec.whatwg.org/#dom-htmlcollection-item - fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<Element>> { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Root<Element>> { let maybe_elem = self.Item(index); *found = maybe_elem.is_some(); maybe_elem } // check-tidy: no specs after this line - fn NamedGetter(self, name: DOMString, found: &mut bool) -> Option<Root<Element>> { + fn NamedGetter(&self, name: DOMString, found: &mut bool) -> Option<Root<Element>> { let maybe_elem = self.NamedItem(name); *found = maybe_elem.is_some(); maybe_elem } // https://dom.spec.whatwg.org/#interface-htmlcollection - fn SupportedPropertyNames(self) -> Vec<DOMString> { + fn SupportedPropertyNames(&self) -> Vec<DOMString> { // Step 1 let mut result = vec![]; diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index 900ba423372..93659612405 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -48,9 +48,9 @@ impl HTMLDataListElement { } } -impl<'a> HTMLDataListElementMethods for &'a HTMLDataListElement { +impl HTMLDataListElementMethods for HTMLDataListElement { // https://html.spec.whatwg.org/multipage/#dom-datalist-options - fn Options(self) -> Root<HTMLCollection> { + fn Options(&self) -> Root<HTMLCollection> { #[derive(JSTraceable, HeapSizeOf)] struct HTMLDataListOptionsFilter; impl CollectionFilter for HTMLDataListOptionsFilter { diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs index 3750ad946d8..5754f5af114 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/components/script/dom/htmldialogelement.rs @@ -51,7 +51,7 @@ impl HTMLDialogElement { } } -impl<'a> HTMLDialogElementMethods for &'a HTMLDialogElement { +impl HTMLDialogElementMethods for HTMLDialogElement { // https://html.spec.whatwg.org/multipage/#dom-dialog-open make_bool_getter!(Open); @@ -59,13 +59,13 @@ impl<'a> HTMLDialogElementMethods for &'a HTMLDialogElement { make_bool_setter!(SetOpen, "open"); // https://html.spec.whatwg.org/multipage/#dom-dialog-returnvalue - fn ReturnValue(self) -> DOMString { + fn ReturnValue(&self) -> DOMString { let return_value = self.return_value.borrow(); return_value.clone() } // https://html.spec.whatwg.org/multipage/#dom-dialog-returnvalue - fn SetReturnValue(self, return_value: DOMString) { + fn SetReturnValue(&self, return_value: DOMString) { *self.return_value.borrow_mut() = return_value; } } diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index e525e8d81e5..e7c9a37887b 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -124,9 +124,9 @@ impl HTMLElement { } } -impl<'a> HTMLElementMethods for &'a HTMLElement { +impl HTMLElementMethods for HTMLElement { // https://html.spec.whatwg.org/multipage/#the-style-attribute - fn Style(self) -> Root<CSSStyleDeclaration> { + fn Style(&self) -> Root<CSSStyleDeclaration> { self.style_decl.or_init(|| { let global = window_from_node(self); CSSStyleDeclaration::new(global.r(), ElementCast::from_ref(self), None, CSSModificationAccess::ReadWrite) @@ -146,12 +146,12 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { global_event_handlers!(NoOnload); // https://html.spec.whatwg.org/multipage/#dom-dataset - fn Dataset(self) -> Root<DOMStringMap> { + fn Dataset(&self) -> Root<DOMStringMap> { self.dataset.or_init(|| DOMStringMap::new(self)) } // https://html.spec.whatwg.org/multipage/#handler-onload - fn GetOnload(self) -> Option<Rc<EventHandlerNonNull>> { + fn GetOnload(&self) -> Option<Rc<EventHandlerNonNull>> { if self.is_body_or_frameset() { let win = window_from_node(self); win.r().GetOnload() @@ -162,7 +162,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://html.spec.whatwg.org/multipage/#handler-onload - fn SetOnload(self, listener: Option<Rc<EventHandlerNonNull>>) { + fn SetOnload(&self, listener: Option<Rc<EventHandlerNonNull>>) { if self.is_body_or_frameset() { let win = window_from_node(self); win.r().SetOnload(listener) @@ -173,7 +173,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://html.spec.whatwg.org/multipage/#dom-click - fn Click(self) { + fn Click(&self) { let maybe_input: Option<&HTMLInputElement> = HTMLInputElementCast::to_ref(self); if let Some(i) = maybe_input { if i.Disabled() { @@ -186,7 +186,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://html.spec.whatwg.org/multipage/#dom-focus - fn Focus(self) { + fn Focus(&self) { // TODO: Mark the element as locked for focus and run the focusing steps. // https://html.spec.whatwg.org/multipage/#focusing-steps let element = ElementCast::from_ref(self); @@ -198,7 +198,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://html.spec.whatwg.org/multipage/#dom-blur - fn Blur(self) { + fn Blur(&self) { // TODO: Run the unfocusing steps. let node = NodeCast::from_ref(self); if !node.get_focus_state() { @@ -212,7 +212,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface - fn GetOffsetParent(self) -> Option<Root<Element>> { + fn GetOffsetParent(&self) -> Option<Root<Element>> { if self.is_htmlbodyelement() || self.is_htmlhtmlelement() { return None; } @@ -225,7 +225,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface - fn OffsetTop(self) -> i32 { + fn OffsetTop(&self) -> i32 { if self.is_htmlbodyelement() { return 0; } @@ -238,7 +238,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface - fn OffsetLeft(self) -> i32 { + fn OffsetLeft(&self) -> i32 { if self.is_htmlbodyelement() { return 0; } @@ -251,7 +251,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface - fn OffsetWidth(self) -> i32 { + fn OffsetWidth(&self) -> i32 { let node = NodeCast::from_ref(self); let window = window_from_node(self); let (_, rect) = window.offset_parent_query(node.to_trusted_node_address()); @@ -260,7 +260,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement { } // https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface - fn OffsetHeight(self) -> i32 { + fn OffsetHeight(&self) -> i32 { let node = NodeCast::from_ref(self); let window = window_from_node(self); let (_, rect) = window.offset_parent_query(node.to_trusted_node_address()); diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index a223f87650e..13ba6c17e76 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -51,9 +51,9 @@ impl HTMLFieldSetElement { } } -impl<'a> HTMLFieldSetElementMethods for &'a HTMLFieldSetElement { +impl HTMLFieldSetElementMethods for HTMLFieldSetElement { // https://www.whatwg.org/html/#dom-fieldset-elements - fn Elements(self) -> Root<HTMLCollection> { + fn Elements(&self) -> Root<HTMLCollection> { #[derive(JSTraceable, HeapSizeOf)] struct ElementsFilter; impl CollectionFilter for ElementsFilter { @@ -70,7 +70,7 @@ impl<'a> HTMLFieldSetElementMethods for &'a HTMLFieldSetElement { } // https://html.spec.whatwg.org/multipage/#dom-cva-validity - fn Validity(self) -> Root<ValidityState> { + fn Validity(&self) -> Root<ValidityState> { let window = window_from_node(self); ValidityState::new(window.r()) } diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index f84582bc5dd..03750d382b8 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -49,7 +49,7 @@ impl HTMLFontElement { } } -impl<'a> HTMLFontElementMethods for &'a HTMLFontElement { +impl HTMLFontElementMethods for HTMLFontElement { make_getter!(Color, "color"); make_setter!(SetColor, "color"); } diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 07a2d0e5f50..11613d866b2 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -79,7 +79,7 @@ impl HTMLFormElement { } } -impl<'a> HTMLFormElementMethods for &'a HTMLFormElement { +impl HTMLFormElementMethods for HTMLFormElement { // https://html.spec.whatwg.org/multipage/#dom-form-acceptcharset make_getter!(AcceptCharset, "accept-charset"); @@ -105,12 +105,12 @@ impl<'a> HTMLFormElementMethods for &'a HTMLFormElement { make_setter!(SetEnctype, "enctype"); // https://html.spec.whatwg.org/multipage/#dom-fs-encoding - fn Encoding(self) -> DOMString { + fn Encoding(&self) -> DOMString { self.Enctype() } // https://html.spec.whatwg.org/multipage/#dom-fs-encoding - fn SetEncoding(self, value: DOMString) { + fn SetEncoding(&self, value: DOMString) { self.SetEnctype(value) } @@ -137,12 +137,12 @@ impl<'a> HTMLFormElementMethods for &'a HTMLFormElement { make_setter!(SetTarget, "target"); // https://html.spec.whatwg.org/multipage/#the-form-element:concept-form-submit - fn Submit(self) { + fn Submit(&self) { self.submit(SubmittedFrom::FromFormSubmitMethod, FormSubmitter::FormElement(self)); } // https://html.spec.whatwg.org/multipage/#dom-form-reset - fn Reset(self) { + fn Reset(&self) { self.reset(ResetFrom::FromFormResetMethod); } } diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 912efc41cba..4732037cbe4 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -238,33 +238,33 @@ pub fn Navigate(iframe: &HTMLIFrameElement, direction: NavigationDirection) -> F } } -impl<'a> HTMLIFrameElementMethods for &'a HTMLIFrameElement { +impl HTMLIFrameElementMethods for HTMLIFrameElement { // https://html.spec.whatwg.org/multipage/#dom-iframe-src - fn Src(self) -> DOMString { + fn Src(&self) -> DOMString { let element = ElementCast::from_ref(self); element.get_string_attribute(&atom!("src")) } // https://html.spec.whatwg.org/multipage/#dom-iframe-src - fn SetSrc(self, src: DOMString) { + fn SetSrc(&self, src: DOMString) { let element = ElementCast::from_ref(self); element.set_url_attribute(&atom!("src"), src) } // https://html.spec.whatwg.org/multipage/#dom-iframe-sandbox - fn Sandbox(self) -> DOMString { + fn Sandbox(&self) -> DOMString { let element = ElementCast::from_ref(self); element.get_string_attribute(&atom!("sandbox")) } // https://html.spec.whatwg.org/multipage/#dom-iframe-sandbox - fn SetSandbox(self, sandbox: DOMString) { + fn SetSandbox(&self, sandbox: DOMString) { let element = ElementCast::from_ref(self); element.set_tokenlist_attribute(&atom!("sandbox"), sandbox); } // https://html.spec.whatwg.org/multipage/#dom-iframe-contentwindow - fn GetContentWindow(self) -> Option<Root<Window>> { + fn GetContentWindow(&self) -> Option<Root<Window>> { self.subpage_id.get().and_then(|subpage_id| { let window = window_from_node(self); let window = window.r(); @@ -277,7 +277,7 @@ impl<'a> HTMLIFrameElementMethods for &'a HTMLIFrameElement { } // https://html.spec.whatwg.org/multipage/#dom-iframe-contentdocument - fn GetContentDocument(self) -> Option<Root<Document>> { + fn GetContentDocument(&self) -> Option<Root<Document>> { self.GetContentWindow().and_then(|window| { let self_url = match self.get_url() { Some(self_url) => self_url, @@ -301,7 +301,7 @@ impl<'a> HTMLIFrameElementMethods for &'a HTMLIFrameElement { // exposing these APIs. See https://github.com/servo/servo/issues/5264. // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-mozbrowser - fn Mozbrowser(self) -> bool { + fn Mozbrowser(&self) -> bool { if opts::experimental_enabled() { let element = ElementCast::from_ref(self); element.has_attribute(&Atom::from_slice("mozbrowser")) @@ -311,7 +311,7 @@ impl<'a> HTMLIFrameElementMethods for &'a HTMLIFrameElement { } // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-mozbrowser - fn SetMozbrowser(self, value: bool) -> ErrorResult { + fn SetMozbrowser(&self, value: bool) -> ErrorResult { if opts::experimental_enabled() { let element = ElementCast::from_ref(self); element.set_bool_attribute(&Atom::from_slice("mozbrowser"), value); @@ -320,22 +320,22 @@ impl<'a> HTMLIFrameElementMethods for &'a HTMLIFrameElement { } // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goBack - fn GoBack(self) -> Fallible<()> { + fn GoBack(&self) -> Fallible<()> { Navigate(self, NavigationDirection::Back) } // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/goForward - fn GoForward(self) -> Fallible<()> { + fn GoForward(&self) -> Fallible<()> { Navigate(self, NavigationDirection::Forward) } // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/reload - fn Reload(self, _hardReload: bool) -> Fallible<()> { + fn Reload(&self, _hardReload: bool) -> Fallible<()> { Err(NotSupported) } // https://developer.mozilla.org/en-US/docs/Web/API/HTMLIFrameElement/stop - fn Stop(self) -> Fallible<()> { + fn Stop(&self) -> Fallible<()> { Err(NotSupported) } diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index bfd13057f25..147bbc3e19c 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -197,7 +197,7 @@ impl LayoutHTMLImageElementHelpers for LayoutJS<HTMLImageElement> { } } -impl<'a> HTMLImageElementMethods for &'a HTMLImageElement { +impl HTMLImageElementMethods for HTMLImageElement { make_getter!(Alt); make_setter!(SetAlt, "alt"); @@ -213,39 +213,39 @@ impl<'a> HTMLImageElementMethods for &'a HTMLImageElement { make_bool_getter!(IsMap); // https://html.spec.whatwg.org/multipage/#dom-img-ismap - fn SetIsMap(self, is_map: bool) { + fn SetIsMap(&self, is_map: bool) { let element = ElementCast::from_ref(self); element.set_string_attribute(&atom!("ismap"), is_map.to_string()) } // https://html.spec.whatwg.org/multipage/#dom-img-width - fn Width(self) -> u32 { + fn Width(&self) -> u32 { let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); rect.size.width.to_px() as u32 } // https://html.spec.whatwg.org/multipage/#dom-img-width - fn SetWidth(self, width: u32) { + fn SetWidth(&self, width: u32) { let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("width"), width) } // https://html.spec.whatwg.org/multipage/#dom-img-height - fn Height(self) -> u32 { + fn Height(&self) -> u32 { let node = NodeCast::from_ref(self); let rect = node.get_bounding_content_box(); rect.size.height.to_px() as u32 } // https://html.spec.whatwg.org/multipage/#dom-img-height - fn SetHeight(self, height: u32) { + fn SetHeight(&self, height: u32) { let elem = ElementCast::from_ref(self); elem.set_uint_attribute(&atom!("height"), height) } // https://html.spec.whatwg.org/multipage/#dom-img-naturalwidth - fn NaturalWidth(self) -> u32 { + fn NaturalWidth(&self) -> u32 { let image = self.image.borrow(); match *image { @@ -255,7 +255,7 @@ impl<'a> HTMLImageElementMethods for &'a HTMLImageElement { } // https://html.spec.whatwg.org/multipage/#dom-img-naturalheight - fn NaturalHeight(self) -> u32 { + fn NaturalHeight(&self) -> u32 { let image = self.image.borrow(); match *image { @@ -265,7 +265,7 @@ impl<'a> HTMLImageElementMethods for &'a HTMLImageElement { } // https://html.spec.whatwg.org/multipage/#dom-img-complete - fn Complete(self) -> bool { + fn Complete(&self) -> bool { let image = self.image.borrow(); image.is_some() } diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index b282b1f2f45..becbf7c4947 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -216,7 +216,7 @@ impl RawLayoutHTMLInputElementHelpers for HTMLInputElement { } } -impl<'a> HTMLInputElementMethods for &'a HTMLInputElement { +impl HTMLInputElementMethods for HTMLInputElement { // https://www.whatwg.org/html/#dom-fe-disabled make_bool_getter!(Disabled); @@ -230,12 +230,12 @@ impl<'a> HTMLInputElementMethods for &'a HTMLInputElement { make_bool_setter!(SetDefaultChecked, "checked"); // https://html.spec.whatwg.org/multipage/#dom-input-checked - fn Checked(self) -> bool { + fn Checked(&self) -> bool { self.checked.get() } // https://html.spec.whatwg.org/multipage/#dom-input-checked - fn SetChecked(self, checked: bool) { + fn SetChecked(&self, checked: bool) { self.update_checked_state(checked, true); } @@ -262,12 +262,12 @@ impl<'a> HTMLInputElementMethods for &'a HTMLInputElement { make_setter!(SetType, "type"); // https://html.spec.whatwg.org/multipage/#dom-input-value - fn Value(self) -> DOMString { + fn Value(&self) -> DOMString { self.textinput.borrow().get_content() } // https://html.spec.whatwg.org/multipage/#dom-input-value - fn SetValue(self, value: DOMString) { + fn SetValue(&self, value: DOMString) { self.textinput.borrow_mut().set_content(value); self.value_changed.set(true); self.force_relayout(); @@ -317,12 +317,12 @@ impl<'a> HTMLInputElementMethods for &'a HTMLInputElement { make_setter!(SetFormTarget, "formtarget"); // https://html.spec.whatwg.org/multipage/#dom-input-indeterminate - fn Indeterminate(self) -> bool { + fn Indeterminate(&self) -> bool { self.indeterminate.get() } // https://html.spec.whatwg.org/multipage/#dom-input-indeterminate - fn SetIndeterminate(self, val: bool) { + fn SetIndeterminate(&self, val: bool) { self.indeterminate.set(val) } } diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index f109cd7be58..072e14bab3b 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -208,7 +208,7 @@ impl HTMLLinkElement { } } -impl<'a> HTMLLinkElementMethods for &'a HTMLLinkElement { +impl HTMLLinkElementMethods for HTMLLinkElement { make_url_getter!(Href); make_setter!(SetHref, "href"); @@ -225,7 +225,7 @@ impl<'a> HTMLLinkElementMethods for &'a HTMLLinkElement { make_setter!(SetType, "type"); // https://html.spec.whatwg.org/multipage/#dom-link-rellist - fn RelList(self) -> Root<DOMTokenList> { + fn RelList(&self) -> Root<DOMTokenList> { self.rel_list.or_init(|| { DOMTokenList::new(ElementCast::from_ref(self), &atom!("rel")) }) diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index a66cfe3b7ee..1bf78c66c8e 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -44,7 +44,7 @@ impl HTMLMetaElement { } } -impl<'a> HTMLMetaElementMethods for &'a HTMLMetaElement { +impl HTMLMetaElementMethods for HTMLMetaElement { // https://html.spec.whatwg.org/multipage/#dom-meta-name make_getter!(Name, "name"); diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index afd3d32b522..5f0520fd763 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -82,9 +82,9 @@ pub fn is_image_data(uri: &str) -> bool { TYPES.iter().any(|&type_| uri.starts_with(type_)) } -impl<'a> HTMLObjectElementMethods for &'a HTMLObjectElement { +impl HTMLObjectElementMethods for HTMLObjectElement { // https://html.spec.whatwg.org/multipage/#dom-cva-validity - fn Validity(self) -> Root<ValidityState> { + fn Validity(&self) -> Root<ValidityState> { let window = window_from_node(self); ValidityState::new(window.r()) } diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index d7173dc8bc8..547136cf931 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -49,7 +49,7 @@ impl HTMLOptGroupElement { } } -impl<'a> HTMLOptGroupElementMethods for &'a HTMLOptGroupElement { +impl HTMLOptGroupElementMethods for HTMLOptGroupElement { // https://www.whatwg.org/html#dom-optgroup-disabled make_bool_getter!(Disabled); diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index daf19217738..f830cc61cc1 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -70,18 +70,18 @@ fn collect_text(node: &&Node, value: &mut DOMString) { } } -impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement { +impl HTMLOptionElementMethods for HTMLOptionElement { // https://www.whatwg.org/html/#dom-option-disabled make_bool_getter!(Disabled); // https://www.whatwg.org/html/#dom-option-disabled - fn SetDisabled(self, disabled: bool) { + fn SetDisabled(&self, disabled: bool) { let elem = ElementCast::from_ref(self); elem.set_bool_attribute(&atom!("disabled"), disabled) } // https://www.whatwg.org/html/#dom-option-text - fn Text(self) -> DOMString { + fn Text(&self) -> DOMString { let node = NodeCast::from_ref(self); let mut content = String::new(); collect_text(&node, &mut content); @@ -90,13 +90,13 @@ impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement { } // https://www.whatwg.org/html/#dom-option-text - fn SetText(self, value: DOMString) { + fn SetText(&self, value: DOMString) { let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } // https://html.spec.whatwg.org/multipage/#attr-option-value - fn Value(self) -> DOMString { + fn Value(&self) -> DOMString { let element = ElementCast::from_ref(self); let attr = &atom!("value"); if element.has_attribute(attr) { @@ -110,7 +110,7 @@ impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement { make_setter!(SetValue, "value"); // https://html.spec.whatwg.org/multipage/#attr-option-label - fn Label(self) -> DOMString { + fn Label(&self) -> DOMString { let element = ElementCast::from_ref(self); let attr = &atom!("label"); if element.has_attribute(attr) { diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index b8633886b2e..0b69f99ce0a 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -46,9 +46,9 @@ impl HTMLOutputElement { } } -impl<'a> HTMLOutputElementMethods for &'a HTMLOutputElement { +impl HTMLOutputElementMethods for HTMLOutputElement { // https://html.spec.whatwg.org/multipage/#dom-cva-validity - fn Validity(self) -> Root<ValidityState> { + fn Validity(&self) -> Root<ValidityState> { let window = window_from_node(self); ValidityState::new(window.r()) } diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 42d398899d1..6cd2c7edcfc 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -572,18 +572,18 @@ impl VirtualMethods for HTMLScriptElement { } } -impl<'a> HTMLScriptElementMethods for &'a HTMLScriptElement { +impl HTMLScriptElementMethods for HTMLScriptElement { make_url_getter!(Src); make_setter!(SetSrc, "src"); // https://www.whatwg.org/html/#dom-script-text - fn Text(self) -> DOMString { + fn Text(&self) -> DOMString { Node::collect_text_contents(NodeCast::from_ref(self).children()) } // https://www.whatwg.org/html/#dom-script-text - fn SetText(self, value: DOMString) { + fn SetText(&self, value: DOMString) { let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 1339db1e6e9..bed90a07c6e 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -57,16 +57,16 @@ impl HTMLSelectElement { } } -impl<'a> HTMLSelectElementMethods for &'a HTMLSelectElement { +impl HTMLSelectElementMethods for HTMLSelectElement { // https://html.spec.whatwg.org/multipage/#dom-cva-validity - fn Validity(self) -> Root<ValidityState> { + fn Validity(&self) -> Root<ValidityState> { let window = window_from_node(self); ValidityState::new(window.r()) } // Note: this function currently only exists for test_union.html. // https://html.spec.whatwg.org/multipage/#dom-select-add - fn Add(self, _element: HTMLOptionElementOrHTMLOptGroupElement, _before: Option<HTMLElementOrLong>) { + fn Add(&self, _element: HTMLOptionElementOrHTMLOptGroupElement, _before: Option<HTMLElementOrLong>) { } // https://www.whatwg.org/html/#dom-fe-disabled @@ -94,7 +94,7 @@ impl<'a> HTMLSelectElementMethods for &'a HTMLSelectElement { make_uint_setter!(SetSize, "size", DEFAULT_SELECT_SIZE); // https://html.spec.whatwg.org/multipage/#dom-select-type - fn Type(self) -> DOMString { + fn Type(&self) -> DOMString { if self.Multiple() { "select-multiple".to_owned() } else { diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index acdecf181e4..153593f5e58 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -74,7 +74,7 @@ impl HTMLTableCellElement { } } -impl<'a> HTMLTableCellElementMethods for &'a HTMLTableCellElement { +impl HTMLTableCellElementMethods for HTMLTableCellElement { // https://html.spec.whatwg.org/multipage/#dom-tdth-colspan make_uint_getter!(ColSpan, "colspan", DEFAULT_COLSPAN); make_uint_setter!(SetColSpan, "colspan"); diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 00edb684e49..b55f9ac341f 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -66,9 +66,9 @@ impl HTMLTableElement { } } -impl<'a> HTMLTableElementMethods for &'a HTMLTableElement { +impl HTMLTableElementMethods for HTMLTableElement { // https://html.spec.whatwg.org/multipage/#dom-table-caption - fn GetCaption(self) -> Option<Root<HTMLTableCaptionElement>> { + fn GetCaption(&self) -> Option<Root<HTMLTableCaptionElement>> { let node = NodeCast::from_ref(self); node.children() .filter_map(|c| { @@ -78,7 +78,7 @@ impl<'a> HTMLTableElementMethods for &'a HTMLTableElement { } // https://html.spec.whatwg.org/multipage/#dom-table-caption - fn SetCaption(self, new_caption: Option<&HTMLTableCaptionElement>) { + fn SetCaption(&self, new_caption: Option<&HTMLTableCaptionElement>) { let node = NodeCast::from_ref(self); if let Some(ref caption) = self.GetCaption() { @@ -92,7 +92,7 @@ impl<'a> HTMLTableElementMethods for &'a HTMLTableElement { } // https://html.spec.whatwg.org/multipage/#dom-table-createcaption - fn CreateCaption(self) -> Root<HTMLElement> { + fn CreateCaption(&self) -> Root<HTMLElement> { let caption = match self.GetCaption() { Some(caption) => caption, None => { @@ -107,14 +107,14 @@ impl<'a> HTMLTableElementMethods for &'a HTMLTableElement { } // https://html.spec.whatwg.org/multipage/#dom-table-deletecaption - fn DeleteCaption(self) { + fn DeleteCaption(&self) { if let Some(caption) = self.GetCaption() { NodeCast::from_ref(caption.r()).remove_self(); } } // https://html.spec.whatwg.org/multipage/#dom-table-createtbody - fn CreateTBody(self) -> Root<HTMLTableSectionElement> { + fn CreateTBody(&self) -> Root<HTMLTableSectionElement> { let tbody = HTMLTableSectionElement::new("tbody".to_owned(), None, document_from_node(self).r()); diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 49c61c7b5b2..cade3dbe712 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -114,7 +114,7 @@ impl HTMLTextAreaElement { } } -impl<'a> HTMLTextAreaElementMethods for &'a HTMLTextAreaElement { +impl HTMLTextAreaElementMethods for HTMLTextAreaElement { // TODO A few of these attributes have default values and additional // constraints @@ -163,18 +163,18 @@ impl<'a> HTMLTextAreaElementMethods for &'a HTMLTextAreaElement { make_setter!(SetWrap, "wrap"); // https://html.spec.whatwg.org/multipage/#dom-textarea-type - fn Type(self) -> DOMString { + fn Type(&self) -> DOMString { "textarea".to_owned() } // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue - fn DefaultValue(self) -> DOMString { + fn DefaultValue(&self) -> DOMString { let node = NodeCast::from_ref(self); node.GetTextContent().unwrap() } // https://html.spec.whatwg.org/multipage/#dom-textarea-defaultvalue - fn SetDefaultValue(self, value: DOMString) { + fn SetDefaultValue(&self, value: DOMString) { let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)); @@ -186,12 +186,12 @@ impl<'a> HTMLTextAreaElementMethods for &'a HTMLTextAreaElement { } // https://html.spec.whatwg.org/multipage/#dom-textarea-value - fn Value(self) -> DOMString { + fn Value(&self) -> DOMString { self.textinput.borrow().get_content() } // https://html.spec.whatwg.org/multipage/#dom-textarea-value - fn SetValue(self, value: DOMString) { + fn SetValue(&self, value: DOMString) { // TODO move the cursor to the end of the field self.textinput.borrow_mut().set_content(value); self.value_changed.set(true); diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index bf365ff7b95..0640a121f5d 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -46,9 +46,9 @@ impl HTMLTitleElement { } } -impl<'a> HTMLTitleElementMethods for &'a HTMLTitleElement { +impl HTMLTitleElementMethods for HTMLTitleElement { // https://www.whatwg.org/html/#dom-title-text - fn Text(self) -> DOMString { + fn Text(&self) -> DOMString { let node = NodeCast::from_ref(self); let mut content = String::new(); for child in node.children() { @@ -62,7 +62,7 @@ impl<'a> HTMLTitleElementMethods for &'a HTMLTitleElement { } // https://www.whatwg.org/html/#dom-title-text - fn SetText(self, value: DOMString) { + fn SetText(&self, value: DOMString) { let node = NodeCast::from_ref(self); node.SetTextContent(Some(value)) } diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 5acbb4f5e59..2819c935a79 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -68,19 +68,19 @@ impl ImageData { } } -impl<'a> ImageDataMethods for &'a ImageData { +impl ImageDataMethods for ImageData { // https://html.spec.whatwg.org/multipage/#dom-imagedata-width - fn Width(self) -> u32 { + fn Width(&self) -> u32 { self.width } // https://html.spec.whatwg.org/multipage/#dom-imagedata-height - fn Height(self) -> u32 { + fn Height(&self) -> u32 { self.height } // https://html.spec.whatwg.org/multipage/#dom-imagedata-data - fn Data(self, _: *mut JSContext) -> *mut JSObject { + fn Data(&self, _: *mut JSContext) -> *mut JSObject { self.data.get() } } diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index 1120ac4f734..1aed28da355 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -757,9 +757,9 @@ impl KeyEventProperties { } } -impl<'a> KeyboardEventMethods for &'a KeyboardEvent { +impl KeyboardEventMethods for KeyboardEvent { // https://w3c.github.io/uievents/#widl-KeyboardEvent-initKeyboardEvent - fn InitKeyboardEvent(self, + fn InitKeyboardEvent(&self, typeArg: DOMString, canBubbleArg: bool, cancelableArg: bool, @@ -782,52 +782,52 @@ impl<'a> KeyboardEventMethods for &'a KeyboardEvent { } // https://w3c.github.io/uievents/#widl-KeyboardEvent-key - fn Key(self) -> DOMString { + fn Key(&self) -> DOMString { self.key_string.borrow().clone() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-code - fn Code(self) -> DOMString { + fn Code(&self) -> DOMString { self.code.borrow().clone() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-location - fn Location(self) -> u32 { + fn Location(&self) -> u32 { self.location.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-ctrlKey - fn CtrlKey(self) -> bool { + fn CtrlKey(&self) -> bool { self.ctrl.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-shiftKey - fn ShiftKey(self) -> bool { + fn ShiftKey(&self) -> bool { self.shift.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-altKey - fn AltKey(self) -> bool { + fn AltKey(&self) -> bool { self.alt.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-metaKey - fn MetaKey(self) -> bool { + fn MetaKey(&self) -> bool { self.meta.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-repeat - fn Repeat(self) -> bool { + fn Repeat(&self) -> bool { self.repeat.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-isComposing - fn IsComposing(self) -> bool { + fn IsComposing(&self) -> bool { self.is_composing.get() } // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#widl-KeyboardEvent-getModifierState - fn GetModifierState(self, keyArg: DOMString) -> bool { + fn GetModifierState(&self, keyArg: DOMString) -> bool { match &*keyArg { "Ctrl" => self.CtrlKey(), "Alt" => self.AltKey(), @@ -840,17 +840,17 @@ impl<'a> KeyboardEventMethods for &'a KeyboardEvent { } // https://w3c.github.io/uievents/#widl-KeyboardEvent-charCode - fn CharCode(self) -> u32 { + fn CharCode(&self) -> u32 { self.char_code.get().unwrap_or(0) } // https://w3c.github.io/uievents/#widl-KeyboardEvent-keyCode - fn KeyCode(self) -> u32 { + fn KeyCode(&self) -> u32 { self.key_code.get() } // https://w3c.github.io/uievents/#widl-KeyboardEvent-which - fn Which(self) -> u32 { + fn Which(&self) -> u32 { self.char_code.get().unwrap_or(self.KeyCode()) } } diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index c937d0e4ef2..22c250bbb55 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -35,9 +35,9 @@ impl Location { } } -impl<'a> LocationMethods for &'a Location { +impl LocationMethods for Location { // https://html.spec.whatwg.org/multipage/#dom-location-assign - fn Assign(self, url: DOMString) { + fn Assign(&self, url: DOMString) { let window = self.window.root(); // TODO: per spec, we should use the _API base URL_ specified by the // _entry settings object_. @@ -48,57 +48,57 @@ impl<'a> LocationMethods for &'a Location { } // https://url.spec.whatwg.org/#dom-urlutils-hash - fn Hash(self) -> USVString { + fn Hash(&self) -> USVString { UrlHelper::Hash(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-href - fn Href(self) -> USVString { + fn Href(&self) -> USVString { UrlHelper::Href(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-host - fn Host(self) -> USVString { + fn Host(&self) -> USVString { UrlHelper::Host(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-hostname - fn Hostname(self) -> USVString { + fn Hostname(&self) -> USVString { UrlHelper::Hostname(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-password - fn Password(self) -> USVString { + fn Password(&self) -> USVString { UrlHelper::Password(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-pathname - fn Pathname(self) -> USVString { + fn Pathname(&self) -> USVString { UrlHelper::Pathname(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-port - fn Port(self) -> USVString { + fn Port(&self) -> USVString { UrlHelper::Port(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-protocol - fn Protocol(self) -> USVString { + fn Protocol(&self) -> USVString { UrlHelper::Protocol(&self.get_url()) } // https://url.spec.whatwg.org/#URLUtils-stringification-behavior - fn Stringifier(self) -> DOMString { + fn Stringifier(&self) -> DOMString { self.Href().0 } // https://url.spec.whatwg.org/#dom-urlutils-search - fn Search(self) -> USVString { + fn Search(&self) -> USVString { UrlHelper::Search(&self.get_url()) } // https://url.spec.whatwg.org/#dom-urlutils-username - fn Username(self) -> USVString { + fn Username(&self) -> USVString { UrlHelper::Username(&self.get_url()) } } diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 1aab4027b64..bb8adc3dcef 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -5,7 +5,7 @@ #[macro_export] macro_rules! make_getter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self) -> DOMString { + fn $attr(&self) -> DOMString { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -20,7 +20,7 @@ macro_rules! make_getter( #[macro_export] macro_rules! make_bool_getter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self) -> bool { + fn $attr(&self) -> bool { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -36,7 +36,7 @@ macro_rules! make_bool_getter( #[macro_export] macro_rules! make_uint_getter( ($attr:ident, $htmlname:expr, $default:expr) => ( - fn $attr(self) -> u32 { + fn $attr(&self) -> u32 { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -55,7 +55,7 @@ macro_rules! make_uint_getter( #[macro_export] macro_rules! make_url_getter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self) -> DOMString { + fn $attr(&self) -> DOMString { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -72,7 +72,7 @@ macro_rules! make_url_getter( #[macro_export] macro_rules! make_url_or_base_getter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self) -> DOMString { + fn $attr(&self) -> DOMString { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -93,7 +93,7 @@ macro_rules! make_url_or_base_getter( #[macro_export] macro_rules! make_enumerated_getter( ( $attr:ident, $htmlname:expr, $default:expr, $(($choices: pat))|+) => ( - fn $attr(self) -> DOMString { + fn $attr(&self) -> DOMString { use dom::bindings::codegen::InheritTypes::ElementCast; use std::ascii::AsciiExt; use std::borrow::ToOwned; @@ -118,7 +118,7 @@ macro_rules! make_enumerated_getter( #[macro_export] macro_rules! make_setter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self, value: DOMString) { + fn $attr(&self, value: DOMString) { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -131,7 +131,7 @@ macro_rules! make_setter( #[macro_export] macro_rules! make_bool_setter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self, value: bool) { + fn $attr(&self, value: bool) { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -144,7 +144,7 @@ macro_rules! make_bool_setter( #[macro_export] macro_rules! make_uint_setter( ($attr:ident, $htmlname:expr, $default:expr) => ( - fn $attr(self, value: u32) { + fn $attr(&self, value: u32) { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let value = if value > 2147483647 { @@ -165,7 +165,7 @@ macro_rules! make_uint_setter( #[macro_export] macro_rules! make_limited_uint_setter( ($attr:ident, $htmlname:expr, $default:expr) => ( - fn $attr(self, value: u32) -> $crate::dom::bindings::error::ErrorResult { + fn $attr(&self, value: u32) -> $crate::dom::bindings::error::ErrorResult { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let value = if value == 0 { @@ -192,7 +192,7 @@ macro_rules! make_limited_uint_setter( #[macro_export] macro_rules! make_atomic_setter( ( $attr:ident, $htmlname:expr ) => ( - fn $attr(self, value: DOMString) { + fn $attr(&self, value: DOMString) { use dom::bindings::codegen::InheritTypes::ElementCast; use string_cache::Atom; let element = ElementCast::from_ref(self); @@ -228,12 +228,12 @@ macro_rules! no_jsmanaged_fields( /// These are used to generate a event handler which has no special case. macro_rules! define_event_handler( ($handler: ident, $event_type: ident, $getter: ident, $setter: ident) => ( - fn $getter(self) -> Option<::std::rc::Rc<$handler>> { + fn $getter(&self) -> Option<::std::rc::Rc<$handler>> { let eventtarget = EventTargetCast::from_ref(self); eventtarget.get_event_handler_common(stringify!($event_type)) } - fn $setter(self, listener: Option<::std::rc::Rc<$handler>>) { + fn $setter(&self, listener: Option<::std::rc::Rc<$handler>>) { let eventtarget = EventTargetCast::from_ref(self); eventtarget.set_event_handler_common(stringify!($event_type), listener) } diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index c3f3f263a57..57b185464bb 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -89,19 +89,19 @@ impl MessageEvent { } } -impl<'a> MessageEventMethods for &'a MessageEvent { +impl MessageEventMethods for MessageEvent { // https://html.spec.whatwg.org/multipage/#dom-messageevent-data - fn Data(self, _cx: *mut JSContext) -> JSVal { + fn Data(&self, _cx: *mut JSContext) -> JSVal { self.data.get() } // https://html.spec.whatwg.org/multipage/#dom-messageevent-origin - fn Origin(self) -> DOMString { + fn Origin(&self) -> DOMString { self.origin.clone() } // https://html.spec.whatwg.org/multipage/#dom-messageevent-lasteventid - 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 2a97104d740..c3722fa0adf 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -114,54 +114,54 @@ impl MouseEvent { } } -impl<'a> MouseEventMethods for &'a MouseEvent { +impl MouseEventMethods for MouseEvent { // https://w3c.github.io/uievents/#widl-MouseEvent-screenX - fn ScreenX(self) -> i32 { + fn ScreenX(&self) -> i32 { self.screen_x.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-screenY - fn ScreenY(self) -> i32 { + fn ScreenY(&self) -> i32 { self.screen_y.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-clientX - fn ClientX(self) -> i32 { + fn ClientX(&self) -> i32 { self.client_x.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-clientY - fn ClientY(self) -> i32 { + fn ClientY(&self) -> i32 { self.client_y.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-ctrlKey - fn CtrlKey(self) -> bool { + fn CtrlKey(&self) -> bool { self.ctrl_key.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-shiftKey - fn ShiftKey(self) -> bool { + fn ShiftKey(&self) -> bool { self.shift_key.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-altKey - fn AltKey(self) -> bool { + fn AltKey(&self) -> bool { self.alt_key.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-metaKey - fn MetaKey(self) -> bool { + fn MetaKey(&self) -> bool { self.meta_key.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-button - fn Button(self) -> i16 { + fn Button(&self) -> i16 { self.button.get() } // https://w3c.github.io/uievents/#widl-MouseEvent-relatedTarget - fn GetRelatedTarget(self) -> Option<Root<EventTarget>> { + fn GetRelatedTarget(&self) -> Option<Root<EventTarget>> { self.related_target.get().map(Root::from_rooted) } @@ -170,7 +170,7 @@ impl<'a> MouseEventMethods for &'a MouseEvent { // - https://bugzilla.mozilla.org/show_bug.cgi?id=1186125 // This returns the same result as current gecko. // https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/which - fn Which(self) -> i32 { + fn Which(&self) -> i32 { if opts::experimental_enabled() { (self.button.get() + 1) as i32 } else { @@ -179,7 +179,7 @@ impl<'a> MouseEventMethods for &'a MouseEvent { } // https://w3c.github.io/uievents/#widl-MouseEvent-initMouseEvent - fn InitMouseEvent(self, + fn InitMouseEvent(&self, typeArg: DOMString, canBubbleArg: bool, cancelableArg: bool, diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index bc08b8d7ce1..6989706f64f 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -35,9 +35,9 @@ impl NamedNodeMap { } } -impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { +impl NamedNodeMapMethods for NamedNodeMap { // https://dom.spec.whatwg.org/#dom-namednodemap-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) let owner = owner.r(); @@ -46,7 +46,7 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-item - fn Item(self, index: u32) -> Option<Root<Attr>> { + fn Item(&self, index: u32) -> Option<Root<Attr>> { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) let owner = owner.r(); @@ -55,7 +55,7 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-getnameditem - fn GetNamedItem(self, name: DOMString) -> Option<Root<Attr>> { + fn GetNamedItem(&self, name: DOMString) -> Option<Root<Attr>> { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) let owner = owner.r(); @@ -63,7 +63,7 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-getnameditemns - fn GetNamedItemNS(self, namespace: Option<DOMString>, local_name: DOMString) + fn GetNamedItemNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> Option<Root<Attr>> { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) @@ -73,7 +73,7 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-removenameditem - fn RemoveNamedItem(self, name: DOMString) -> Fallible<Root<Attr>> { + fn RemoveNamedItem(&self, name: DOMString) -> Fallible<Root<Attr>> { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) let owner = owner.r(); @@ -82,7 +82,7 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-removenameditemns - fn RemoveNamedItemNS(self, namespace: Option<DOMString>, local_name: DOMString) + fn RemoveNamedItemNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> Fallible<Root<Attr>> { let owner = self.owner.root(); // FIXME(https://github.com/rust-lang/rust/issues/23338) @@ -92,20 +92,20 @@ impl<'a> NamedNodeMapMethods for &'a NamedNodeMap { } // https://dom.spec.whatwg.org/#dom-namednodemap-item - fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<Attr>> { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Root<Attr>> { let item = self.Item(index); *found = item.is_some(); item } // check-tidy: no specs after this line - fn NamedGetter(self, name: DOMString, found: &mut bool) -> Option<Root<Attr>> { + fn NamedGetter(&self, name: DOMString, found: &mut bool) -> Option<Root<Attr>> { let item = self.GetNamedItem(name); *found = item.is_some(); item } - fn SupportedPropertyNames(self) -> Vec<DOMString> { + fn SupportedPropertyNames(&self) -> Vec<DOMString> { // FIXME: unimplemented (https://github.com/servo/servo/issues/7273) vec![] } diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 4f08281c1a1..4f3f3d2c2da 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -30,39 +30,39 @@ impl Navigator { } } -impl<'a> NavigatorMethods for &'a Navigator { +impl NavigatorMethods for Navigator { // https://html.spec.whatwg.org/multipage/#dom-navigator-product - fn Product(self) -> DOMString { + fn Product(&self) -> DOMString { navigatorinfo::Product() } // https://html.spec.whatwg.org/multipage/#dom-navigator-taintenabled - fn TaintEnabled(self) -> bool { + fn TaintEnabled(&self) -> bool { navigatorinfo::TaintEnabled() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appname - fn AppName(self) -> DOMString { + fn AppName(&self) -> DOMString { navigatorinfo::AppName() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appcodename - fn AppCodeName(self) -> DOMString { + fn AppCodeName(&self) -> DOMString { navigatorinfo::AppCodeName() } // https://html.spec.whatwg.org/multipage/#dom-navigator-platform - fn Platform(self) -> DOMString { + fn Platform(&self) -> DOMString { navigatorinfo::Platform() } // https://html.spec.whatwg.org/multipage/#dom-navigator-useragent - fn UserAgent(self) -> DOMString { + fn UserAgent(&self) -> DOMString { navigatorinfo::UserAgent() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appversion - fn AppVersion(self) -> DOMString { + fn AppVersion(&self) -> DOMString { navigatorinfo::AppVersion() } } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 0db0c2c6ee5..ac21c9eefc2 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1892,9 +1892,9 @@ impl Node { } } -impl<'a> NodeMethods for &'a Node { +impl NodeMethods for Node { // https://dom.spec.whatwg.org/#dom-node-nodetype - fn NodeType(self) -> u16 { + fn NodeType(&self) -> u16 { match self.type_id { NodeTypeId::CharacterData(CharacterDataTypeId::Text) => NodeConstants::TEXT_NODE, @@ -1914,7 +1914,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-nodename - fn NodeName(self) -> DOMString { + fn NodeName(&self) -> DOMString { match self.type_id { NodeTypeId::Element(..) => { let elem: &Element = ElementCast::to_ref(self).unwrap(); @@ -1937,12 +1937,12 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-baseuri - fn BaseURI(self) -> DOMString { + fn BaseURI(&self) -> DOMString { self.owner_doc().URL() } // https://dom.spec.whatwg.org/#dom-node-ownerdocument - fn GetOwnerDocument(self) -> Option<Root<Document>> { + fn GetOwnerDocument(&self) -> Option<Root<Document>> { match self.type_id { NodeTypeId::CharacterData(..) | NodeTypeId::Element(..) | @@ -1953,22 +1953,22 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-parentnode - fn GetParentNode(self) -> Option<Root<Node>> { + fn GetParentNode(&self) -> Option<Root<Node>> { self.parent_node.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-node-parentelement - fn GetParentElement(self) -> Option<Root<Element>> { + fn GetParentElement(&self) -> Option<Root<Element>> { self.GetParentNode().and_then(ElementCast::to_root) } // https://dom.spec.whatwg.org/#dom-node-haschildnodes - fn HasChildNodes(self) -> bool { + fn HasChildNodes(&self) -> bool { self.first_child.get().is_some() } // https://dom.spec.whatwg.org/#dom-node-childnodes - fn ChildNodes(self) -> Root<NodeList> { + fn ChildNodes(&self) -> Root<NodeList> { self.child_list.or_init(|| { let doc = self.owner_doc(); let window = doc.r().window(); @@ -1977,39 +1977,39 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-firstchild - fn GetFirstChild(self) -> Option<Root<Node>> { + fn GetFirstChild(&self) -> Option<Root<Node>> { self.first_child.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-node-lastchild - fn GetLastChild(self) -> Option<Root<Node>> { + fn GetLastChild(&self) -> Option<Root<Node>> { self.last_child.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-node-previoussibling - fn GetPreviousSibling(self) -> Option<Root<Node>> { + fn GetPreviousSibling(&self) -> Option<Root<Node>> { self.prev_sibling.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-node-nextsibling - fn GetNextSibling(self) -> Option<Root<Node>> { + fn GetNextSibling(&self) -> Option<Root<Node>> { self.next_sibling.get().map(Root::from_rooted) } // https://dom.spec.whatwg.org/#dom-node-nodevalue - fn GetNodeValue(self) -> Option<DOMString> { + fn GetNodeValue(&self) -> Option<DOMString> { CharacterDataCast::to_ref(self).map(|c| c.Data()) } // https://dom.spec.whatwg.org/#dom-node-nodevalue - fn SetNodeValue(self, val: Option<DOMString>) { + fn SetNodeValue(&self, val: Option<DOMString>) { if let NodeTypeId::CharacterData(..) = self.type_id { self.SetTextContent(val) } } // https://dom.spec.whatwg.org/#dom-node-textcontent - fn GetTextContent(self) -> Option<DOMString> { + fn GetTextContent(&self) -> Option<DOMString> { match self.type_id { NodeTypeId::DocumentFragment | NodeTypeId::Element(..) => { @@ -2028,7 +2028,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-textcontent - fn SetTextContent(self, value: Option<DOMString>) { + fn SetTextContent(&self, value: Option<DOMString>) { let value = value.unwrap_or(String::new()); match self.type_id { NodeTypeId::DocumentFragment | @@ -2058,17 +2058,17 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-insertbefore - fn InsertBefore(self, node: &Node, child: Option<&Node>) -> Fallible<Root<Node>> { + fn InsertBefore(&self, node: &Node, child: Option<&Node>) -> Fallible<Root<Node>> { Node::pre_insert(node, self, child) } // https://dom.spec.whatwg.org/#dom-node-appendchild - fn AppendChild(self, node: &Node) -> Fallible<Root<Node>> { + fn AppendChild(&self, node: &Node) -> Fallible<Root<Node>> { Node::pre_insert(node, self, None) } // https://dom.spec.whatwg.org/#concept-node-replace - fn ReplaceChild(self, node: &Node, child: &Node) -> Fallible<Root<Node>> { + fn ReplaceChild(&self, node: &Node, child: &Node) -> Fallible<Root<Node>> { // Step 1. match self.type_id { @@ -2204,13 +2204,13 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-removechild - fn RemoveChild(self, node: &Node) + fn RemoveChild(&self, node: &Node) -> Fallible<Root<Node>> { Node::pre_remove(node, self) } // https://dom.spec.whatwg.org/#dom-node-normalize - fn Normalize(self) { + fn Normalize(&self) { let mut prev_text: Option<Root<Text>> = None; for child in self.children() { match TextCast::to_ref(child.r()) { @@ -2239,7 +2239,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-clonenode - fn CloneNode(self, deep: bool) -> Root<Node> { + fn CloneNode(&self, deep: bool) -> Root<Node> { Node::clone(self, None, if deep { CloneChildrenFlag::CloneChildren } else { @@ -2248,7 +2248,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-isequalnode - fn IsEqualNode(self, maybe_node: Option<&Node>) -> bool { + fn IsEqualNode(&self, maybe_node: Option<&Node>) -> bool { fn is_equal_doctype(node: &Node, other: &Node) -> bool { let doctype: &DocumentType = DocumentTypeCast::to_ref(node).unwrap(); let other_doctype: &DocumentType = DocumentTypeCast::to_ref(other).unwrap(); @@ -2333,7 +2333,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-comparedocumentposition - fn CompareDocumentPosition(self, other: &Node) -> u16 { + fn CompareDocumentPosition(&self, other: &Node) -> u16 { if self == other { // step 2. 0 @@ -2387,7 +2387,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-contains - fn Contains(self, maybe_other: Option<&Node>) -> bool { + fn Contains(&self, maybe_other: Option<&Node>) -> bool { match maybe_other { None => false, Some(other) => self.is_inclusive_ancestor_of(other) @@ -2395,7 +2395,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-lookupprefix - fn LookupPrefix(self, namespace: Option<DOMString>) -> Option<DOMString> { + fn LookupPrefix(&self, namespace: Option<DOMString>) -> Option<DOMString> { let namespace = namespace_from_domstring(namespace); // Step 1. @@ -2421,7 +2421,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-lookupnamespaceuri - fn LookupNamespaceURI(self, prefix: Option<DOMString>) -> Option<DOMString> { + fn LookupNamespaceURI(&self, prefix: Option<DOMString>) -> Option<DOMString> { // Step 1. let prefix = match prefix { Some(ref p) if p.is_empty() => None, @@ -2433,7 +2433,7 @@ impl<'a> NodeMethods for &'a Node { } // https://dom.spec.whatwg.org/#dom-node-isdefaultnamespace - fn IsDefaultNamespace(self, namespace: Option<DOMString>) -> bool { + fn IsDefaultNamespace(&self, namespace: Option<DOMString>) -> bool { // Step 1. let namespace = namespace_from_domstring(namespace); // Steps 2 and 3. diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index 31b90309c33..e81262de32f 100644 --- a/components/script/dom/nodeiterator.rs +++ b/components/script/dom/nodeiterator.rs @@ -66,19 +66,19 @@ impl NodeIterator { } } -impl<'a> NodeIteratorMethods for &'a NodeIterator { +impl NodeIteratorMethods for NodeIterator { // https://dom.spec.whatwg.org/#dom-nodeiterator-root - fn Root(self) -> Root<Node> { + fn Root(&self) -> Root<Node> { self.root_node.root() } // https://dom.spec.whatwg.org/#dom-nodeiterator-whattoshow - fn WhatToShow(self) -> u32 { + fn WhatToShow(&self) -> u32 { self.what_to_show } // https://dom.spec.whatwg.org/#dom-nodeiterator-filter - fn GetFilter(self) -> Option<Rc<NodeFilter>> { + fn GetFilter(&self) -> Option<Rc<NodeFilter>> { match self.filter { Filter::None => None, Filter::Callback(ref nf) => Some((*nf).clone()), @@ -87,17 +87,17 @@ impl<'a> NodeIteratorMethods for &'a NodeIterator { } // https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode - fn ReferenceNode(self) -> Root<Node> { + fn ReferenceNode(&self) -> Root<Node> { self.reference_node.get().root() } // https://dom.spec.whatwg.org/#dom-nodeiterator-pointerbeforereferencenode - fn PointerBeforeReferenceNode(self) -> bool { + fn PointerBeforeReferenceNode(&self) -> bool { self.pointer_before_reference_node.get() } // https://dom.spec.whatwg.org/#dom-nodeiterator-nextnode - fn NextNode(self) -> Fallible<Option<Root<Node>>> { + fn NextNode(&self) -> Fallible<Option<Root<Node>>> { // https://dom.spec.whatwg.org/#concept-NodeIterator-traverse // Step 1. let node = self.reference_node.get().root(); @@ -141,7 +141,7 @@ impl<'a> NodeIteratorMethods for &'a NodeIterator { } // https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode - fn PreviousNode(self) -> Fallible<Option<Root<Node>>> { + fn PreviousNode(&self) -> Fallible<Option<Root<Node>>> { // https://dom.spec.whatwg.org/#concept-NodeIterator-traverse // Step 1. let node = self.reference_node.get().root(); @@ -186,7 +186,7 @@ impl<'a> NodeIteratorMethods for &'a NodeIterator { } // https://dom.spec.whatwg.org/#dom-nodeiterator-detach - fn Detach(self) { + fn Detach(&self) { // This method intentionally left blank. } } diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index a39abe056a1..01bc27d3a08 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -52,9 +52,9 @@ impl NodeList { } } -impl<'a> NodeListMethods for &'a NodeList { +impl NodeListMethods for NodeList { // https://dom.spec.whatwg.org/#dom-nodelist-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { match self.list_type { NodeListType::Simple(ref elems) => elems.len() as u32, NodeListType::Children(ref list) => list.len(), @@ -62,7 +62,7 @@ impl<'a> NodeListMethods for &'a NodeList { } // https://dom.spec.whatwg.org/#dom-nodelist-item - fn Item(self, index: u32) -> Option<Root<Node>> { + fn Item(&self, index: u32) -> Option<Root<Node>> { match self.list_type { NodeListType::Simple(ref elems) => { elems.get(index as usize).map(|node| Root::from_rooted(*node)) @@ -72,7 +72,7 @@ impl<'a> NodeListMethods for &'a NodeList { } // https://dom.spec.whatwg.org/#dom-nodelist-item - fn IndexedGetter(self, index: u32, found: &mut bool) -> Option<Root<Node>> { + fn IndexedGetter(&self, index: u32, found: &mut bool) -> Option<Root<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 f2e59cf6aee..2d0a5990cdc 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -43,14 +43,14 @@ impl Performance { } } -impl<'a> PerformanceMethods for &'a Performance { +impl PerformanceMethods for Performance { // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/NavigationTiming/Overview.html#performance-timing-attribute - fn Timing(self) -> Root<PerformanceTiming> { + fn Timing(&self) -> Root<PerformanceTiming> { self.timing.root() } // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/HighResolutionTime/Overview.html#dom-performance-now - fn Now(self) -> DOMHighResTimeStamp { + fn Now(&self) -> DOMHighResTimeStamp { let navStart = self.timing.root().r().NavigationStartPrecise(); let now = (time::precise_time_ns() as f64 - navStart) / 1000000 as f64; Finite::wrap(now) diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs index 4d453dcb4bb..9992f87f3c8 100644 --- a/components/script/dom/performancetiming.rs +++ b/components/script/dom/performancetiming.rs @@ -38,10 +38,10 @@ impl PerformanceTiming { } } -impl<'a> PerformanceTimingMethods for &'a PerformanceTiming { +impl PerformanceTimingMethods for PerformanceTiming { // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/ // NavigationTiming/Overview.html#dom-performancetiming-navigationstart - 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 aabe0b95f80..d3c1e655490 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -47,9 +47,9 @@ impl ProcessingInstruction { } } -impl<'a> ProcessingInstructionMethods for &'a ProcessingInstruction { +impl ProcessingInstructionMethods for ProcessingInstruction { // https://dom.spec.whatwg.org/#dom-processinginstruction-target - 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 8012ff00b53..88a369606ae 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -61,19 +61,19 @@ impl ProgressEvent { } } -impl<'a> ProgressEventMethods for &'a ProgressEvent { +impl ProgressEventMethods for ProgressEvent { // https://xhr.spec.whatwg.org/#dom-progressevent-lengthcomputable - fn LengthComputable(self) -> bool { + fn LengthComputable(&self) -> bool { self.length_computable } // https://xhr.spec.whatwg.org/#dom-progressevent-loaded - fn Loaded(self) -> u64 { + fn Loaded(&self) -> u64 { self.loaded } // https://xhr.spec.whatwg.org/#dom-progressevent-total - 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 58a1a51aede..d86c4e96951 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -132,40 +132,40 @@ impl Range { } } -impl<'a> RangeMethods for &'a Range { +impl RangeMethods for Range { // https://dom.spec.whatwg.org/#dom-range-startcontainer - fn StartContainer(self) -> Root<Node> { + fn StartContainer(&self) -> Root<Node> { self.inner().borrow().start.node() } // https://dom.spec.whatwg.org/#dom-range-startoffset - fn StartOffset(self) -> u32 { + fn StartOffset(&self) -> u32 { self.inner().borrow().start.offset } // https://dom.spec.whatwg.org/#dom-range-endcontainer - fn EndContainer(self) -> Root<Node> { + fn EndContainer(&self) -> Root<Node> { self.inner().borrow().end.node() } // https://dom.spec.whatwg.org/#dom-range-endoffset - fn EndOffset(self) -> u32 { + fn EndOffset(&self) -> u32 { self.inner().borrow().end.offset } // https://dom.spec.whatwg.org/#dom-range-collapsed - fn Collapsed(self) -> bool { + fn Collapsed(&self) -> bool { let inner = self.inner().borrow(); inner.start == inner.end } // https://dom.spec.whatwg.org/#dom-range-commonancestorcontainer - fn CommonAncestorContainer(self) -> Root<Node> { + fn CommonAncestorContainer(&self) -> Root<Node> { self.inner().borrow().common_ancestor_container() } // https://dom.spec.whatwg.org/#dom-range-setstartnode-offset - fn SetStart(self, node: &Node, offset: u32) -> ErrorResult { + fn SetStart(&self, node: &Node, offset: u32) -> ErrorResult { if node.is_doctype() { // Step 1. Err(Error::InvalidNodeType) @@ -180,7 +180,7 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-setendnode-offset - fn SetEnd(self, node: &Node, offset: u32) -> ErrorResult { + fn SetEnd(&self, node: &Node, offset: u32) -> ErrorResult { if node.is_doctype() { // Step 1. Err(Error::InvalidNodeType) @@ -195,46 +195,46 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-setstartbeforenode - fn SetStartBefore(self, node: &Node) -> ErrorResult { + fn SetStartBefore(&self, node: &Node) -> ErrorResult { let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); self.SetStart(parent.r(), node.index()) } // https://dom.spec.whatwg.org/#dom-range-setstartafternode - fn SetStartAfter(self, node: &Node) -> ErrorResult { + fn SetStartAfter(&self, node: &Node) -> ErrorResult { let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); self.SetStart(parent.r(), node.index() + 1) } // https://dom.spec.whatwg.org/#dom-range-setendbeforenode - fn SetEndBefore(self, node: &Node) -> ErrorResult { + fn SetEndBefore(&self, node: &Node) -> ErrorResult { let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); self.SetEnd(parent.r(), node.index()) } // https://dom.spec.whatwg.org/#dom-range-setendafternode - fn SetEndAfter(self, node: &Node) -> ErrorResult { + fn SetEndAfter(&self, node: &Node) -> ErrorResult { let parent = try!(node.GetParentNode().ok_or(Error::InvalidNodeType)); self.SetEnd(parent.r(), node.index() + 1) } // https://dom.spec.whatwg.org/#dom-range-collapsetostart - fn Collapse(self, to_start: bool) { + fn Collapse(&self, to_start: bool) { self.inner().borrow_mut().collapse(to_start); } // https://dom.spec.whatwg.org/#dom-range-selectnodenode - fn SelectNode(self, node: &Node) -> ErrorResult { + fn SelectNode(&self, node: &Node) -> ErrorResult { self.inner().borrow_mut().select_node(node) } // https://dom.spec.whatwg.org/#dom-range-selectnodecontentsnode - fn SelectNodeContents(self, node: &Node) -> ErrorResult { + fn SelectNodeContents(&self, node: &Node) -> ErrorResult { self.inner().borrow_mut().select_node_contents(node) } // https://dom.spec.whatwg.org/#dom-range-compareboundarypointshow-sourcerange - fn CompareBoundaryPoints(self, how: u16, source_range: &Range) + fn CompareBoundaryPoints(&self, how: u16, source_range: &Range) -> Fallible<i16> { if how > RangeConstants::END_TO_START { // Step 1. @@ -275,7 +275,7 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-clonerange - fn CloneRange(self) -> Root<Range> { + fn CloneRange(&self) -> Root<Range> { let inner = self.inner().borrow(); let start = &inner.start; let end = &inner.end; @@ -286,7 +286,7 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-ispointinrangenode-offset - fn IsPointInRange(self, node: &Node, offset: u32) -> Fallible<bool> { + fn IsPointInRange(&self, node: &Node, offset: u32) -> Fallible<bool> { match self.inner().borrow().compare_point(node, offset) { Ok(Ordering::Less) => Ok(false), Ok(Ordering::Equal) => Ok(true), @@ -300,7 +300,7 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-comparepointnode-offset - fn ComparePoint(self, node: &Node, offset: u32) -> Fallible<i16> { + fn ComparePoint(&self, node: &Node, offset: u32) -> Fallible<i16> { self.inner().borrow().compare_point(node, offset).map(|order| { match order { Ordering::Less => -1, @@ -311,7 +311,7 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-intersectsnode - fn IntersectsNode(self, node: &Node) -> bool { + fn IntersectsNode(&self, node: &Node) -> bool { let inner = self.inner().borrow(); let start = &inner.start; let start_node = start.node(); @@ -343,7 +343,7 @@ impl<'a> RangeMethods for &'a Range { // https://dom.spec.whatwg.org/#dom-range-clonecontents // https://dom.spec.whatwg.org/#concept-range-clone - fn CloneContents(self) -> Fallible<Root<DocumentFragment>> { + fn CloneContents(&self) -> Fallible<Root<DocumentFragment>> { let inner = self.inner.borrow(); let start = &inner.start; let end = &inner.end; @@ -452,7 +452,7 @@ impl<'a> RangeMethods for &'a Range { // https://dom.spec.whatwg.org/#dom-range-extractcontents // https://dom.spec.whatwg.org/#concept-range-extract - fn ExtractContents(self) -> Fallible<Root<DocumentFragment>> { + fn ExtractContents(&self) -> Fallible<Root<DocumentFragment>> { // Step 3. let (start_node, start_offset, end_node, end_offset) = { @@ -581,13 +581,13 @@ impl<'a> RangeMethods for &'a Range { } // https://dom.spec.whatwg.org/#dom-range-detach - fn Detach(self) { + fn Detach(&self) { // This method intentionally left blank. } // https://dom.spec.whatwg.org/#dom-range-insertnode // https://dom.spec.whatwg.org/#concept-range-insert - fn InsertNode(self, node: &Node) -> ErrorResult { + fn InsertNode(&self, node: &Node) -> ErrorResult { let (start_node, start_offset) = { let inner = self.inner().borrow(); let start = &inner.start; diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index 84a439735c4..e38dc676afe 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -28,14 +28,14 @@ impl Screen { } } -impl<'a> ScreenMethods for &'a Screen { +impl ScreenMethods for Screen { // https://drafts.csswg.org/cssom-view/#dom-screen-colordepth - fn ColorDepth(self) -> u32 { + fn ColorDepth(&self) -> u32 { 24 } // https://drafts.csswg.org/cssom-view/#dom-screen-pixeldepth - fn PixelDepth(self) -> u32 { + fn PixelDepth(&self) -> u32 { 24 } } diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 29872ab068a..a749663d945 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -55,9 +55,9 @@ impl Storage { } -impl<'a> StorageMethods for &'a Storage { +impl StorageMethods for Storage { // https://html.spec.whatwg.org/multipage/#dom-storage-length - fn Length(self) -> u32 { + fn Length(&self) -> u32 { let (sender, receiver) = ipc::channel().unwrap(); self.get_storage_task().send(StorageTaskMsg::Length(sender, self.get_url(), self.storage_type)).unwrap(); @@ -65,7 +65,7 @@ impl<'a> StorageMethods for &'a Storage { } // https://html.spec.whatwg.org/multipage/#dom-storage-key - fn Key(self, index: u32) -> Option<DOMString> { + fn Key(&self, index: u32) -> Option<DOMString> { let (sender, receiver) = ipc::channel().unwrap(); self.get_storage_task().send(StorageTaskMsg::Key(sender, self.get_url(), self.storage_type, index)).unwrap(); @@ -73,7 +73,7 @@ impl<'a> StorageMethods for &'a Storage { } // https://html.spec.whatwg.org/multipage/#dom-storage-getitem - fn GetItem(self, name: DOMString) -> Option<DOMString> { + fn GetItem(&self, name: DOMString) -> Option<DOMString> { let (sender, receiver) = ipc::channel().unwrap(); let msg = StorageTaskMsg::GetItem(sender, self.get_url(), self.storage_type, name); @@ -82,7 +82,7 @@ impl<'a> StorageMethods for &'a Storage { } // https://html.spec.whatwg.org/multipage/#dom-storage-setitem - fn SetItem(self, name: DOMString, value: DOMString) { + fn SetItem(&self, name: DOMString, value: DOMString) { let (sender, receiver) = ipc::channel().unwrap(); let msg = StorageTaskMsg::SetItem(sender, self.get_url(), self.storage_type, name.clone(), value.clone()); @@ -94,7 +94,7 @@ impl<'a> StorageMethods for &'a Storage { } // https://html.spec.whatwg.org/multipage/#dom-storage-removeitem - fn RemoveItem(self, name: DOMString) { + fn RemoveItem(&self, name: DOMString) { let (sender, receiver) = ipc::channel().unwrap(); let msg = StorageTaskMsg::RemoveItem(sender, self.get_url(), self.storage_type, name.clone()); @@ -105,7 +105,7 @@ impl<'a> StorageMethods for &'a Storage { } // https://html.spec.whatwg.org/multipage/#dom-storage-clear - fn Clear(self) { + fn Clear(&self) { let (sender, receiver) = ipc::channel().unwrap(); self.get_storage_task().send(StorageTaskMsg::Clear(sender, self.get_url(), self.storage_type)).unwrap(); @@ -115,25 +115,25 @@ impl<'a> StorageMethods for &'a Storage { } // check-tidy: no specs after this line - fn NamedGetter(self, name: DOMString, found: &mut bool) -> Option<DOMString> { + fn NamedGetter(&self, name: DOMString, found: &mut bool) -> Option<DOMString> { let item = self.GetItem(name); *found = item.is_some(); item } - fn NamedSetter(self, name: DOMString, value: DOMString) { + fn NamedSetter(&self, name: DOMString, value: DOMString) { self.SetItem(name, value); } - fn NamedCreator(self, name: DOMString, value: DOMString) { + fn NamedCreator(&self, name: DOMString, value: DOMString) { self.SetItem(name, value); } - fn NamedDeleter(self, name: DOMString) { + fn NamedDeleter(&self, name: DOMString) { self.RemoveItem(name); } - fn SupportedPropertyNames(self) -> Vec<DOMString> { + fn SupportedPropertyNames(&self) -> Vec<DOMString> { // FIXME: unimplemented (https://github.com/servo/servo/issues/7273) vec![] } diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index 8f722ece866..c83fb4807b6 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -87,29 +87,29 @@ impl StorageEvent { } } -impl<'a> StorageEventMethods for &'a StorageEvent { +impl StorageEventMethods for StorageEvent { // https://html.spec.whatwg.org/multipage/#dom-storageevent-key - fn GetKey(self) -> Option<DOMString> { + fn GetKey(&self) -> Option<DOMString> { self.key.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-storageevent-oldvalue - fn GetOldValue(self) -> Option<DOMString> { + fn GetOldValue(&self) -> Option<DOMString> { self.oldValue.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-storageevent-newvalue - fn GetNewValue(self) -> Option<DOMString> { + fn GetNewValue(&self) -> Option<DOMString> { self.newValue.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-storageevent-url - fn Url(self) -> DOMString { + fn Url(&self) -> DOMString { self.url.borrow().clone() } // https://html.spec.whatwg.org/multipage/#dom-storageevent-storagearea - fn GetStorageArea(self) -> Option<Root<Storage>> { + fn GetStorageArea(&self) -> Option<Root<Storage>> { self.storageArea.get().map(Root::from_rooted) } } diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 08df44b77ef..335e261634b 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -35,333 +35,333 @@ pub struct TestBinding { global: GlobalField, } -impl<'a> TestBindingMethods for &'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 UnrestrictedFloatAttribute(self) -> f32 { 0. } - fn SetUnrestrictedFloatAttribute(self, _: f32) {} - fn FloatAttribute(self) -> Finite<f32> { Finite::wrap(0.) } - fn SetFloatAttribute(self, _: Finite<f32>) {} - fn UnrestrictedDoubleAttribute(self) -> f64 { 0. } - fn SetUnrestrictedDoubleAttribute(self, _: f64) {} - fn DoubleAttribute(self) -> Finite<f64> { Finite::wrap(0.) } - fn SetDoubleAttribute(self, _: Finite<f64>) {} - fn StringAttribute(self) -> DOMString { "".to_owned() } - fn SetStringAttribute(self, _: DOMString) {} - fn UsvstringAttribute(self) -> USVString { USVString("".to_owned()) } - fn SetUsvstringAttribute(self, _: USVString) {} - fn ByteStringAttribute(self) -> ByteString { ByteString::new(vec!()) } - fn SetByteStringAttribute(self, _: ByteString) {} - fn EnumAttribute(self) -> TestEnum { _empty } - fn SetEnumAttribute(self, _: TestEnum) {} - fn InterfaceAttribute(self) -> Root<Blob> { +impl TestBindingMethods for 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 UnrestrictedFloatAttribute(&self) -> f32 { 0. } + fn SetUnrestrictedFloatAttribute(&self, _: f32) {} + fn FloatAttribute(&self) -> Finite<f32> { Finite::wrap(0.) } + fn SetFloatAttribute(&self, _: Finite<f32>) {} + fn UnrestrictedDoubleAttribute(&self) -> f64 { 0. } + fn SetUnrestrictedDoubleAttribute(&self, _: f64) {} + fn DoubleAttribute(&self) -> Finite<f64> { Finite::wrap(0.) } + fn SetDoubleAttribute(&self, _: Finite<f64>) {} + fn StringAttribute(&self) -> DOMString { "".to_owned() } + fn SetStringAttribute(&self, _: DOMString) {} + fn UsvstringAttribute(&self) -> USVString { USVString("".to_owned()) } + fn SetUsvstringAttribute(&self, _: USVString) {} + fn ByteStringAttribute(&self) -> ByteString { ByteString::new(vec!()) } + fn SetByteStringAttribute(&self, _: ByteString) {} + fn EnumAttribute(&self) -> TestEnum { _empty } + fn SetEnumAttribute(&self, _: TestEnum) {} + fn InterfaceAttribute(&self) -> Root<Blob> { let global = self.global.root(); Blob::new(global.r(), None, "") } - fn SetInterfaceAttribute(self, _: &Blob) {} - fn UnionAttribute(self) -> HTMLElementOrLong { eLong(0) } - fn SetUnionAttribute(self, _: HTMLElementOrLong) {} - fn Union2Attribute(self) -> EventOrString { eString("".to_owned()) } - fn SetUnion2Attribute(self, _: EventOrString) {} - fn ArrayAttribute(self, _: *mut JSContext) -> *mut JSObject { NullValue().to_object_or_null() } - fn AnyAttribute(self, _: *mut JSContext) -> JSVal { NullValue() } - fn SetAnyAttribute(self, _: *mut JSContext, _: HandleValue) {} - fn ObjectAttribute(self, _: *mut JSContext) -> *mut JSObject { panic!() } - fn SetObjectAttribute(self, _: *mut JSContext, _: *mut JSObject) {} + fn SetInterfaceAttribute(&self, _: &Blob) {} + fn UnionAttribute(&self) -> HTMLElementOrLong { eLong(0) } + fn SetUnionAttribute(&self, _: HTMLElementOrLong) {} + fn Union2Attribute(&self) -> EventOrString { eString("".to_owned()) } + fn SetUnion2Attribute(&self, _: EventOrString) {} + fn ArrayAttribute(&self, _: *mut JSContext) -> *mut JSObject { NullValue().to_object_or_null() } + fn AnyAttribute(&self, _: *mut JSContext) -> JSVal { NullValue() } + fn SetAnyAttribute(&self, _: *mut JSContext, _: HandleValue) {} + fn ObjectAttribute(&self, _: *mut JSContext) -> *mut JSObject { panic!() } + fn SetObjectAttribute(&self, _: *mut JSContext, _: *mut JSObject) {} - 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 GetUnrestrictedFloatAttributeNullable(self) -> Option<f32> { Some(0.) } - fn SetUnrestrictedFloatAttributeNullable(self, _: Option<f32>) {} - fn GetFloatAttributeNullable(self) -> Option<Finite<f32>> { Some(Finite::wrap(0.)) } - fn SetFloatAttributeNullable(self, _: Option<Finite<f32>>) {} - fn GetUnrestrictedDoubleAttributeNullable(self) -> Option<f64> { Some(0.) } - fn SetUnrestrictedDoubleAttributeNullable(self, _: Option<f64>) {} - fn GetDoubleAttributeNullable(self) -> Option<Finite<f64>> { Some(Finite::wrap(0.)) } - fn SetDoubleAttributeNullable(self, _: Option<Finite<f64>>) {} - fn GetByteStringAttributeNullable(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } - fn SetByteStringAttributeNullable(self, _: Option<ByteString>) {} - fn GetStringAttributeNullable(self) -> Option<DOMString> { Some("".to_owned()) } - fn SetStringAttributeNullable(self, _: Option<DOMString>) {} - fn GetUsvstringAttributeNullable(self) -> Option<USVString> { Some(USVString("".to_owned())) } - fn SetUsvstringAttributeNullable(self, _: Option<USVString>) {} - fn SetBinaryRenamedAttribute(self, _: DOMString) {} - fn ForwardedAttribute(self) -> Root<TestBinding> { Root::from_ref(self) } - fn BinaryRenamedAttribute(self) -> DOMString { "".to_owned() } - fn GetEnumAttributeNullable(self) -> Option<TestEnum> { Some(_empty) } - fn GetInterfaceAttributeNullable(self) -> Option<Root<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 GetUnrestrictedFloatAttributeNullable(&self) -> Option<f32> { Some(0.) } + fn SetUnrestrictedFloatAttributeNullable(&self, _: Option<f32>) {} + fn GetFloatAttributeNullable(&self) -> Option<Finite<f32>> { Some(Finite::wrap(0.)) } + fn SetFloatAttributeNullable(&self, _: Option<Finite<f32>>) {} + fn GetUnrestrictedDoubleAttributeNullable(&self) -> Option<f64> { Some(0.) } + fn SetUnrestrictedDoubleAttributeNullable(&self, _: Option<f64>) {} + fn GetDoubleAttributeNullable(&self) -> Option<Finite<f64>> { Some(Finite::wrap(0.)) } + fn SetDoubleAttributeNullable(&self, _: Option<Finite<f64>>) {} + fn GetByteStringAttributeNullable(&self) -> Option<ByteString> { Some(ByteString::new(vec!())) } + fn SetByteStringAttributeNullable(&self, _: Option<ByteString>) {} + fn GetStringAttributeNullable(&self) -> Option<DOMString> { Some("".to_owned()) } + fn SetStringAttributeNullable(&self, _: Option<DOMString>) {} + fn GetUsvstringAttributeNullable(&self) -> Option<USVString> { Some(USVString("".to_owned())) } + fn SetUsvstringAttributeNullable(&self, _: Option<USVString>) {} + fn SetBinaryRenamedAttribute(&self, _: DOMString) {} + fn ForwardedAttribute(&self) -> Root<TestBinding> { Root::from_ref(self) } + fn BinaryRenamedAttribute(&self) -> DOMString { "".to_owned() } + fn GetEnumAttributeNullable(&self) -> Option<TestEnum> { Some(_empty) } + fn GetInterfaceAttributeNullable(&self) -> Option<Root<Blob>> { let global = self.global.root(); Some(Blob::new(global.r(), None, "")) } - fn SetInterfaceAttributeNullable(self, _: Option<&Blob>) {} - fn GetObjectAttributeNullable(self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() } - fn SetObjectAttributeNullable(self, _: *mut JSContext, _: *mut JSObject) {} - fn GetUnionAttributeNullable(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } - fn SetUnionAttributeNullable(self, _: Option<HTMLElementOrLong>) {} - fn GetUnion2AttributeNullable(self) -> Option<EventOrString> { Some(eString("".to_owned())) } - fn SetUnion2AttributeNullable(self, _: Option<EventOrString>) {} - fn BinaryRenamedMethod(self) -> () {} - 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 ReceiveUnrestrictedFloat(self) -> f32 { 0. } - fn ReceiveFloat(self) -> Finite<f32> { Finite::wrap(0.) } - fn ReceiveUnrestrictedDouble(self) -> f64 { 0. } - fn ReceiveDouble(self) -> Finite<f64> { Finite::wrap(0.) } - fn ReceiveString(self) -> DOMString { "".to_owned() } - fn ReceiveUsvstring(self) -> USVString { USVString("".to_owned()) } - fn ReceiveByteString(self) -> ByteString { ByteString::new(vec!()) } - fn ReceiveEnum(self) -> TestEnum { _empty } - fn ReceiveInterface(self) -> Root<Blob> { + fn SetInterfaceAttributeNullable(&self, _: Option<&Blob>) {} + fn GetObjectAttributeNullable(&self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() } + fn SetObjectAttributeNullable(&self, _: *mut JSContext, _: *mut JSObject) {} + fn GetUnionAttributeNullable(&self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } + fn SetUnionAttributeNullable(&self, _: Option<HTMLElementOrLong>) {} + fn GetUnion2AttributeNullable(&self) -> Option<EventOrString> { Some(eString("".to_owned())) } + fn SetUnion2AttributeNullable(&self, _: Option<EventOrString>) {} + fn BinaryRenamedMethod(&self) -> () {} + 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 ReceiveUnrestrictedFloat(&self) -> f32 { 0. } + fn ReceiveFloat(&self) -> Finite<f32> { Finite::wrap(0.) } + fn ReceiveUnrestrictedDouble(&self) -> f64 { 0. } + fn ReceiveDouble(&self) -> Finite<f64> { Finite::wrap(0.) } + fn ReceiveString(&self) -> DOMString { "".to_owned() } + fn ReceiveUsvstring(&self) -> USVString { USVString("".to_owned()) } + fn ReceiveByteString(&self) -> ByteString { ByteString::new(vec!()) } + fn ReceiveEnum(&self) -> TestEnum { _empty } + fn ReceiveInterface(&self) -> Root<Blob> { let global = self.global.root(); Blob::new(global.r(), None, "") } - fn ReceiveAny(self, _: *mut JSContext) -> JSVal { NullValue() } - fn ReceiveObject(self, _: *mut JSContext) -> *mut JSObject { panic!() } - fn ReceiveUnion(self) -> HTMLElementOrLong { eLong(0) } - fn ReceiveUnion2(self) -> EventOrString { eString("".to_owned()) } + fn ReceiveAny(&self, _: *mut JSContext) -> JSVal { NullValue() } + fn ReceiveObject(&self, _: *mut JSContext) -> *mut JSObject { panic!() } + fn ReceiveUnion(&self) -> HTMLElementOrLong { eLong(0) } + fn ReceiveUnion2(&self) -> EventOrString { eString("".to_owned()) } - 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 ReceiveNullableUnrestrictedFloat(self) -> Option<f32> { Some(0.) } - fn ReceiveNullableFloat(self) -> Option<Finite<f32>> { Some(Finite::wrap(0.)) } - fn ReceiveNullableUnrestrictedDouble(self) -> Option<f64> { Some(0.) } - fn ReceiveNullableDouble(self) -> Option<Finite<f64>> { Some(Finite::wrap(0.)) } - fn ReceiveNullableString(self) -> Option<DOMString> { Some("".to_owned()) } - fn ReceiveNullableUsvstring(self) -> Option<USVString> { Some(USVString("".to_owned())) } - fn ReceiveNullableByteString(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } - fn ReceiveNullableEnum(self) -> Option<TestEnum> { Some(_empty) } - fn ReceiveNullableInterface(self) -> Option<Root<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 ReceiveNullableUnrestrictedFloat(&self) -> Option<f32> { Some(0.) } + fn ReceiveNullableFloat(&self) -> Option<Finite<f32>> { Some(Finite::wrap(0.)) } + fn ReceiveNullableUnrestrictedDouble(&self) -> Option<f64> { Some(0.) } + fn ReceiveNullableDouble(&self) -> Option<Finite<f64>> { Some(Finite::wrap(0.)) } + fn ReceiveNullableString(&self) -> Option<DOMString> { Some("".to_owned()) } + fn ReceiveNullableUsvstring(&self) -> Option<USVString> { Some(USVString("".to_owned())) } + fn ReceiveNullableByteString(&self) -> Option<ByteString> { Some(ByteString::new(vec!())) } + fn ReceiveNullableEnum(&self) -> Option<TestEnum> { Some(_empty) } + fn ReceiveNullableInterface(&self) -> Option<Root<Blob>> { let global = self.global.root(); Some(Blob::new(global.r(), None, "")) } - fn ReceiveNullableObject(self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() } - fn ReceiveNullableUnion(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } - fn ReceiveNullableUnion2(self) -> Option<EventOrString> { Some(eString("".to_owned())) } + fn ReceiveNullableObject(&self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() } + fn ReceiveNullableUnion(&self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } + fn ReceiveNullableUnion2(&self) -> Option<EventOrString> { Some(eString("".to_owned())) } - 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 PassUnrestrictedFloat(self, _: f32) {} - fn PassFloat(self, _: Finite<f32>) {} - fn PassUnrestrictedDouble(self, _: f64) {} - fn PassDouble(self, _: Finite<f64>) {} - fn PassString(self, _: DOMString) {} - fn PassUsvstring(self, _: USVString) {} - fn PassByteString(self, _: ByteString) {} - fn PassEnum(self, _: TestEnum) {} - fn PassInterface(self, _: &Blob) {} - fn PassUnion(self, _: HTMLElementOrLong) {} - fn PassUnion2(self, _: EventOrString) {} - fn PassUnion3(self, _: BlobOrString) {} - fn PassAny(self, _: *mut JSContext, _: HandleValue) {} - fn PassObject(self, _: *mut JSContext, _: *mut JSObject) {} - fn PassCallbackFunction(self, _: Rc<Function>) {} - fn PassCallbackInterface(self, _: Rc<EventListener>) {} + 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 PassUnrestrictedFloat(&self, _: f32) {} + fn PassFloat(&self, _: Finite<f32>) {} + fn PassUnrestrictedDouble(&self, _: f64) {} + fn PassDouble(&self, _: Finite<f64>) {} + fn PassString(&self, _: DOMString) {} + fn PassUsvstring(&self, _: USVString) {} + fn PassByteString(&self, _: ByteString) {} + fn PassEnum(&self, _: TestEnum) {} + fn PassInterface(&self, _: &Blob) {} + fn PassUnion(&self, _: HTMLElementOrLong) {} + fn PassUnion2(&self, _: EventOrString) {} + fn PassUnion3(&self, _: BlobOrString) {} + fn PassAny(&self, _: *mut JSContext, _: HandleValue) {} + fn PassObject(&self, _: *mut JSContext, _: *mut JSObject) {} + fn PassCallbackFunction(&self, _: Rc<Function>) {} + fn PassCallbackInterface(&self, _: Rc<EventListener>) {} - 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 PassNullableUnrestrictedFloat(self, _: Option<f32>) {} - fn PassNullableFloat(self, _: Option<Finite<f32>>) {} - fn PassNullableUnrestrictedDouble(self, _: Option<f64>) {} - fn PassNullableDouble(self, _: Option<Finite<f64>>) {} - fn PassNullableString(self, _: Option<DOMString>) {} - fn PassNullableUsvstring(self, _: Option<USVString>) {} - fn PassNullableByteString(self, _: Option<ByteString>) {} + 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 PassNullableUnrestrictedFloat(&self, _: Option<f32>) {} + fn PassNullableFloat(&self, _: Option<Finite<f32>>) {} + fn PassNullableUnrestrictedDouble(&self, _: Option<f64>) {} + fn PassNullableDouble(&self, _: Option<Finite<f64>>) {} + fn PassNullableString(&self, _: Option<DOMString>) {} + fn PassNullableUsvstring(&self, _: Option<USVString>) {} + fn PassNullableByteString(&self, _: Option<ByteString>) {} // fn PassNullableEnum(self, _: Option<TestEnum>) {} - fn PassNullableInterface(self, _: Option<&Blob>) {} - fn PassNullableObject(self, _: *mut JSContext, _: *mut JSObject) {} - fn PassNullableUnion(self, _: Option<HTMLElementOrLong>) {} - fn PassNullableUnion2(self, _: Option<EventOrString>) {} - fn PassNullableCallbackFunction(self, _: Option<Rc<Function>>) {} - fn PassNullableCallbackInterface(self, _: Option<Rc<EventListener>>) {} + fn PassNullableInterface(&self, _: Option<&Blob>) {} + fn PassNullableObject(&self, _: *mut JSContext, _: *mut JSObject) {} + fn PassNullableUnion(&self, _: Option<HTMLElementOrLong>) {} + fn PassNullableUnion2(&self, _: Option<EventOrString>) {} + fn PassNullableCallbackFunction(&self, _: Option<Rc<Function>>) {} + fn PassNullableCallbackInterface(&self, _: Option<Rc<EventListener>>) {} - 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 PassOptionalUnrestrictedFloat(self, _: Option<f32>) {} - fn PassOptionalFloat(self, _: Option<Finite<f32>>) {} - fn PassOptionalUnrestrictedDouble(self, _: Option<f64>) {} - fn PassOptionalDouble(self, _: Option<Finite<f64>>) {} - fn PassOptionalString(self, _: Option<DOMString>) {} - fn PassOptionalUsvstring(self, _: Option<USVString>) {} - fn PassOptionalByteString(self, _: Option<ByteString>) {} - fn PassOptionalEnum(self, _: Option<TestEnum>) {} - fn PassOptionalInterface(self, _: Option<&Blob>) {} - fn PassOptionalUnion(self, _: Option<HTMLElementOrLong>) {} - fn PassOptionalUnion2(self, _: Option<EventOrString>) {} - fn PassOptionalAny(self, _: *mut JSContext, _: HandleValue) {} - fn PassOptionalObject(self, _: *mut JSContext, _: Option<*mut JSObject>) {} - fn PassOptionalCallbackFunction(self, _: Option<Rc<Function>>) {} - fn PassOptionalCallbackInterface(self, _: Option<Rc<EventListener>>) {} + 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 PassOptionalUnrestrictedFloat(&self, _: Option<f32>) {} + fn PassOptionalFloat(&self, _: Option<Finite<f32>>) {} + fn PassOptionalUnrestrictedDouble(&self, _: Option<f64>) {} + fn PassOptionalDouble(&self, _: Option<Finite<f64>>) {} + fn PassOptionalString(&self, _: Option<DOMString>) {} + fn PassOptionalUsvstring(&self, _: Option<USVString>) {} + fn PassOptionalByteString(&self, _: Option<ByteString>) {} + fn PassOptionalEnum(&self, _: Option<TestEnum>) {} + fn PassOptionalInterface(&self, _: Option<&Blob>) {} + fn PassOptionalUnion(&self, _: Option<HTMLElementOrLong>) {} + fn PassOptionalUnion2(&self, _: Option<EventOrString>) {} + fn PassOptionalAny(&self, _: *mut JSContext, _: HandleValue) {} + fn PassOptionalObject(&self, _: *mut JSContext, _: Option<*mut JSObject>) {} + fn PassOptionalCallbackFunction(&self, _: Option<Rc<Function>>) {} + fn PassOptionalCallbackInterface(&self, _: Option<Rc<EventListener>>) {} - 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 PassOptionalNullableUnrestrictedFloat(self, _: Option<Option<f32>>) {} - fn PassOptionalNullableFloat(self, _: Option<Option<Finite<f32>>>) {} - fn PassOptionalNullableUnrestrictedDouble(self, _: Option<Option<f64>>) {} - fn PassOptionalNullableDouble(self, _: Option<Option<Finite<f64>>>) {} - fn PassOptionalNullableString(self, _: Option<Option<DOMString>>) {} - fn PassOptionalNullableUsvstring(self, _: Option<Option<USVString>>) {} - fn PassOptionalNullableByteString(self, _: Option<Option<ByteString>>) {} + 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 PassOptionalNullableUnrestrictedFloat(&self, _: Option<Option<f32>>) {} + fn PassOptionalNullableFloat(&self, _: Option<Option<Finite<f32>>>) {} + fn PassOptionalNullableUnrestrictedDouble(&self, _: Option<Option<f64>>) {} + fn PassOptionalNullableDouble(&self, _: Option<Option<Finite<f64>>>) {} + fn PassOptionalNullableString(&self, _: Option<Option<DOMString>>) {} + fn PassOptionalNullableUsvstring(&self, _: Option<Option<USVString>>) {} + fn PassOptionalNullableByteString(&self, _: Option<Option<ByteString>>) {} // fn PassOptionalNullableEnum(self, _: Option<Option<TestEnum>>) {} - fn PassOptionalNullableInterface(self, _: Option<Option<&Blob>>) {} - fn PassOptionalNullableObject(self, _: *mut JSContext, _: Option<*mut JSObject>) {} - fn PassOptionalNullableUnion(self, _: Option<Option<HTMLElementOrLong>>) {} - fn PassOptionalNullableUnion2(self, _: Option<Option<EventOrString>>) {} - fn PassOptionalNullableCallbackFunction(self, _: Option<Option<Rc<Function>>>) {} - fn PassOptionalNullableCallbackInterface(self, _: Option<Option<Rc<EventListener>>>) {} + fn PassOptionalNullableInterface(&self, _: Option<Option<&Blob>>) {} + fn PassOptionalNullableObject(&self, _: *mut JSContext, _: Option<*mut JSObject>) {} + fn PassOptionalNullableUnion(&self, _: Option<Option<HTMLElementOrLong>>) {} + fn PassOptionalNullableUnion2(&self, _: Option<Option<EventOrString>>) {} + fn PassOptionalNullableCallbackFunction(&self, _: Option<Option<Rc<Function>>>) {} + fn PassOptionalNullableCallbackInterface(&self, _: Option<Option<Rc<EventListener>>>) {} - 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 PassOptionalUsvstringWithDefault(self, _: USVString) {} - 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 PassOptionalUsvstringWithDefault(&self, _: USVString) {} + 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 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 PassOptionalNullableUnrestrictedFloatWithDefault(self, _: Option<f32>) {} // fn PassOptionalNullableFloatWithDefault(self, _: Option<Finite<f32>>) {} // fn PassOptionalNullableUnrestrictedDoubleWithDefault(self, _: Option<f64>) {} // fn PassOptionalNullableDoubleWithDefault(self, _: Option<Finite<f64>>) {} - fn PassOptionalNullableStringWithDefault(self, _: Option<DOMString>) {} - fn PassOptionalNullableUsvstringWithDefault(self, _: Option<USVString>) {} - fn PassOptionalNullableByteStringWithDefault(self, _: Option<ByteString>) {} + fn PassOptionalNullableStringWithDefault(&self, _: Option<DOMString>) {} + fn PassOptionalNullableUsvstringWithDefault(&self, _: Option<USVString>) {} + fn PassOptionalNullableByteStringWithDefault(&self, _: Option<ByteString>) {} // fn PassOptionalNullableEnumWithDefault(self, _: Option<TestEnum>) {} - fn PassOptionalNullableInterfaceWithDefault(self, _: Option<&Blob>) {} - fn PassOptionalNullableObjectWithDefault(self, _: *mut JSContext, _: *mut JSObject) {} - fn PassOptionalNullableUnionWithDefault(self, _: Option<HTMLElementOrLong>) {} - fn PassOptionalNullableUnion2WithDefault(self, _: Option<EventOrString>) {} + fn PassOptionalNullableInterfaceWithDefault(&self, _: Option<&Blob>) {} + fn PassOptionalNullableObjectWithDefault(&self, _: *mut JSContext, _: *mut JSObject) {} + fn PassOptionalNullableUnionWithDefault(&self, _: Option<HTMLElementOrLong>) {} + fn PassOptionalNullableUnion2WithDefault(&self, _: Option<EventOrString>) {} // fn PassOptionalNullableCallbackFunctionWithDefault(self, _: Option<Function>) {} - fn PassOptionalNullableCallbackInterfaceWithDefault(self, _: Option<Rc<EventListener>>) {} - fn PassOptionalAnyWithDefault(self, _: *mut JSContext, _: HandleValue) {} + fn PassOptionalNullableCallbackInterfaceWithDefault(&self, _: Option<Rc<EventListener>>) {} + fn PassOptionalAnyWithDefault(&self, _: *mut JSContext, _: HandleValue) {} - 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 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 PassOptionalNullableUnrestrictedFloatWithNonNullDefault(self, _: Option<f32>) {} // fn PassOptionalNullableFloatWithNonNullDefault(self, _: Option<Finite<f32>>) {} // fn PassOptionalNullableUnrestrictedDoubleWithNonNullDefault(self, _: Option<f64>) {} // fn PassOptionalNullableDoubleWithNonNullDefault(self, _: Option<Finite<f64>>) {} - fn PassOptionalNullableStringWithNonNullDefault(self, _: Option<DOMString>) {} - fn PassOptionalNullableUsvstringWithNonNullDefault(self, _: Option<USVString>) {} + fn PassOptionalNullableStringWithNonNullDefault(&self, _: Option<DOMString>) {} + fn PassOptionalNullableUsvstringWithNonNullDefault(&self, _: Option<USVString>) {} // 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 PassVariadicUnrestrictedFloat(self, _: Vec<f32>) {} - fn PassVariadicFloat(self, _: Vec<Finite<f32>>) {} - fn PassVariadicUnrestrictedDouble(self, _: Vec<f64>) {} - fn PassVariadicDouble(self, _: Vec<Finite<f64>>) {} - fn PassVariadicString(self, _: Vec<DOMString>) {} - fn PassVariadicUsvstring(self, _: Vec<USVString>) {} - fn PassVariadicByteString(self, _: Vec<ByteString>) {} - fn PassVariadicEnum(self, _: Vec<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 PassVariadicUnrestrictedFloat(&self, _: Vec<f32>) {} + fn PassVariadicFloat(&self, _: Vec<Finite<f32>>) {} + fn PassVariadicUnrestrictedDouble(&self, _: Vec<f64>) {} + fn PassVariadicDouble(&self, _: Vec<Finite<f64>>) {} + fn PassVariadicString(&self, _: Vec<DOMString>) {} + fn PassVariadicUsvstring(&self, _: Vec<USVString>) {} + fn PassVariadicByteString(&self, _: Vec<ByteString>) {} + fn PassVariadicEnum(&self, _: Vec<TestEnum>) {} // fn PassVariadicInterface(self, _: Vec<&Blob>) {} - fn PassVariadicUnion(self, _: Vec<HTMLElementOrLong>) {} - fn PassVariadicUnion2(self, _: Vec<EventOrString>) {} - fn PassVariadicUnion3(self, _: Vec<BlobOrString>) {} - fn PassVariadicAny(self, _: *mut JSContext, _: Vec<HandleValue>) {} - fn PassVariadicObject(self, _: *mut JSContext, _: Vec<*mut JSObject>) {} + fn PassVariadicUnion(&self, _: Vec<HTMLElementOrLong>) {} + fn PassVariadicUnion2(&self, _: Vec<EventOrString>) {} + fn PassVariadicUnion3(&self, _: Vec<BlobOrString>) {} + fn PassVariadicAny(&self, _: *mut JSContext, _: Vec<HandleValue>) {} + fn PassVariadicObject(&self, _: *mut JSContext, _: Vec<*mut JSObject>) {} } impl TestBinding { diff --git a/components/script/dom/testbindingproxy.rs b/components/script/dom/testbindingproxy.rs index 8241811761f..3c1f23c8ae1 100644 --- a/components/script/dom/testbindingproxy.rs +++ b/components/script/dom/testbindingproxy.rs @@ -14,21 +14,21 @@ pub struct TestBindingProxy { reflector_: Reflector } -impl<'a> TestBindingProxyMethods for &'a TestBindingProxy { - fn Length(self) -> u32 {0} - fn SupportedPropertyNames(self) -> Vec<DOMString> {vec![]} - fn GetNamedItem(self, _: DOMString) -> DOMString {"".to_owned()} - fn SetNamedItem(self, _: DOMString, _: DOMString) -> () {} - fn GetItem(self, _: u32) -> DOMString {"".to_owned()} - fn SetItem(self, _: u32, _: DOMString) -> () {} - fn RemoveItem(self, _: DOMString) -> () {} - fn Stringifier(self) -> DOMString {"".to_owned()} - fn NamedCreator(self, _: DOMString, _: DOMString) -> () {} - fn IndexedGetter(self, _: u32, _: &mut bool) -> DOMString {"".to_owned()} - fn NamedDeleter(self, _: DOMString) -> () {} - fn IndexedSetter(self, _: u32, _: DOMString) -> () {} - fn NamedSetter(self, _: DOMString, _: DOMString) -> () {} - fn IndexedCreator(self, _: u32, _: DOMString) -> () {} - fn NamedGetter(self, _: DOMString, _: &mut bool) -> DOMString {"".to_owned()} +impl TestBindingProxyMethods for TestBindingProxy { + fn Length(&self) -> u32 {0} + fn SupportedPropertyNames(&self) -> Vec<DOMString> {vec![]} + fn GetNamedItem(&self, _: DOMString) -> DOMString {"".to_owned()} + fn SetNamedItem(&self, _: DOMString, _: DOMString) -> () {} + fn GetItem(&self, _: u32) -> DOMString {"".to_owned()} + fn SetItem(&self, _: u32, _: DOMString) -> () {} + fn RemoveItem(&self, _: DOMString) -> () {} + fn Stringifier(&self) -> DOMString {"".to_owned()} + fn NamedCreator(&self, _: DOMString, _: DOMString) -> () {} + fn IndexedGetter(&self, _: u32, _: &mut bool) -> DOMString {"".to_owned()} + fn NamedDeleter(&self, _: DOMString) -> () {} + fn IndexedSetter(&self, _: u32, _: DOMString) -> () {} + fn NamedSetter(&self, _: DOMString, _: DOMString) -> () {} + fn IndexedCreator(&self, _: u32, _: DOMString) -> () {} + fn NamedGetter(&self, _: DOMString, _: &mut bool) -> DOMString {"".to_owned()} } diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index cf4b85a9480..2eac167ca51 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -49,9 +49,9 @@ impl Text { } } -impl<'a> TextMethods for &'a Text { +impl TextMethods for Text { // https://dom.spec.whatwg.org/#dom-text-splittextoffset - fn SplitText(self, offset: u32) -> Fallible<Root<Text>> { + fn SplitText(&self, offset: u32) -> Fallible<Root<Text>> { let cdata = CharacterDataCast::from_ref(self); // Step 1. let length = cdata.Length(); @@ -87,7 +87,7 @@ impl<'a> TextMethods for &'a Text { } // https://dom.spec.whatwg.org/#dom-text-wholetext - fn WholeText(self) -> DOMString { + fn WholeText(&self) -> DOMString { let first = NodeCast::from_ref(self).inclusively_preceding_siblings() .take_while(|node| node.r().is_text()) .last().unwrap(); diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs index 822793f0a7a..e058562bebb 100644 --- a/components/script/dom/textdecoder.rs +++ b/components/script/dom/textdecoder.rs @@ -73,20 +73,20 @@ impl TextDecoder { } -impl<'a> TextDecoderMethods for &'a TextDecoder { +impl TextDecoderMethods for TextDecoder { // https://encoding.spec.whatwg.org/#dom-textdecoder-encoding - fn Encoding(self) -> DOMString { + fn Encoding(&self) -> DOMString { self.encoding.whatwg_name().unwrap().to_owned() } // https://encoding.spec.whatwg.org/#dom-textdecoder-fatal - fn Fatal(self) -> bool { + fn Fatal(&self) -> bool { self.fatal } #[allow(unsafe_code)] // https://encoding.spec.whatwg.org/#dom-textdecoder-decode - fn Decode(self, _cx: *mut JSContext, input: Option<*mut JSObject>) + fn Decode(&self, _cx: *mut JSContext, input: Option<*mut JSObject>) -> Fallible<USVString> { let input = match input { Some(input) => input, diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 53f356b2785..7144ad77330 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -70,15 +70,15 @@ impl TextEncoder { } } -impl<'a> TextEncoderMethods for &'a TextEncoder { +impl TextEncoderMethods for TextEncoder { // https://encoding.spec.whatwg.org/#dom-textencoder-encoding - fn Encoding(self) -> DOMString { + fn Encoding(&self) -> DOMString { self.encoding.clone() } #[allow(unsafe_code)] // https://encoding.spec.whatwg.org/#dom-textencoder-encode - fn Encode(self, cx: *mut JSContext, input: USVString) -> *mut JSObject { + fn Encode(&self, cx: *mut JSContext, input: USVString) -> *mut JSObject { unsafe { let encoded = self.encoder.encode(&input.0, EncoderTrap::Strict).unwrap(); let length = encoded.len() as u32; diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index 73f2c44e717..eb30ab5ff4b 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -63,19 +63,19 @@ impl TreeWalker { } } -impl<'a> TreeWalkerMethods for &'a TreeWalker { +impl TreeWalkerMethods for TreeWalker { // https://dom.spec.whatwg.org/#dom-treewalker-root - fn Root(self) -> Root<Node> { + fn Root(&self) -> Root<Node> { self.root_node.root() } // https://dom.spec.whatwg.org/#dom-treewalker-whattoshow - fn WhatToShow(self) -> u32 { + fn WhatToShow(&self) -> u32 { self.what_to_show } // https://dom.spec.whatwg.org/#dom-treewalker-filter - fn GetFilter(self) -> Option<Rc<NodeFilter>> { + fn GetFilter(&self) -> Option<Rc<NodeFilter>> { match self.filter { Filter::None => None, Filter::JS(ref nf) => Some(nf.clone()), @@ -84,17 +84,17 @@ impl<'a> TreeWalkerMethods for &'a TreeWalker { } // https://dom.spec.whatwg.org/#dom-treewalker-currentnode - fn CurrentNode(self) -> Root<Node> { + fn CurrentNode(&self) -> Root<Node> { self.current_node.get().root() } // https://dom.spec.whatwg.org/#dom-treewalker-currentnode - fn SetCurrentNode(self, node: &Node) { + fn SetCurrentNode(&self, node: &Node) { self.current_node.set(JS::from_ref(node)); } // https://dom.spec.whatwg.org/#dom-treewalker-parentnode - fn ParentNode(self) -> Fallible<Option<Root<Node>>> { + fn ParentNode(&self) -> Fallible<Option<Root<Node>>> { // "1. Let node be the value of the currentNode attribute." let mut node = self.current_node.get().root(); // "2. While node is not null and is not root, run these substeps:" @@ -118,35 +118,35 @@ impl<'a> TreeWalkerMethods for &'a TreeWalker { } // https://dom.spec.whatwg.org/#dom-treewalker-firstchild - fn FirstChild(self) -> Fallible<Option<Root<Node>>> { + fn FirstChild(&self) -> Fallible<Option<Root<Node>>> { // "The firstChild() method must traverse children of type first." self.traverse_children(|node| node.GetFirstChild(), |node| node.GetNextSibling()) } // https://dom.spec.whatwg.org/#dom-treewalker-lastchild - fn LastChild(self) -> Fallible<Option<Root<Node>>> { + fn LastChild(&self) -> Fallible<Option<Root<Node>>> { // "The lastChild() method must traverse children of type last." self.traverse_children(|node| node.GetLastChild(), |node| node.GetPreviousSibling()) } // https://dom.spec.whatwg.org/#dom-treewalker-previoussibling - fn PreviousSibling(self) -> Fallible<Option<Root<Node>>> { + fn PreviousSibling(&self) -> Fallible<Option<Root<Node>>> { // "The nextSibling() method must traverse siblings of type next." self.traverse_siblings(|node| node.GetLastChild(), |node| node.GetPreviousSibling()) } // https://dom.spec.whatwg.org/#dom-treewalker-nextsibling - fn NextSibling(self) -> Fallible<Option<Root<Node>>> { + fn NextSibling(&self) -> Fallible<Option<Root<Node>>> { // "The previousSibling() method must traverse siblings of type previous." self.traverse_siblings(|node| node.GetFirstChild(), |node| node.GetNextSibling()) } // https://dom.spec.whatwg.org/#dom-treewalker-previousnode - fn PreviousNode(self) -> Fallible<Option<Root<Node>>> { + fn PreviousNode(&self) -> Fallible<Option<Root<Node>>> { // "1. Let node be the value of the currentNode attribute." let mut node = self.current_node.get().root(); // "2. While node is not root, run these substeps:" @@ -203,7 +203,7 @@ impl<'a> TreeWalkerMethods for &'a TreeWalker { } // https://dom.spec.whatwg.org/#dom-treewalker-nextnode - fn NextNode(self) -> Fallible<Option<Root<Node>>> { + fn NextNode(&self) -> Fallible<Option<Root<Node>>> { // "1. Let node be the value of the currentNode attribute." let mut node = self.current_node.get().root(); // "2. Let result be FILTER_ACCEPT." diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index 61a961b0049..ff9c2beab6b 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -86,19 +86,19 @@ impl UIEvent { } } -impl<'a> UIEventMethods for &'a UIEvent { +impl UIEventMethods for UIEvent { // https://w3c.github.io/uievents/#widl-UIEvent-view - fn GetView(self) -> Option<Root<Window>> { + fn GetView(&self) -> Option<Root<Window>> { self.view.get().map(Root::from_rooted) } // https://w3c.github.io/uievents/#widl-UIEvent-detail - fn Detail(self) -> i32 { + fn Detail(&self) -> i32 { self.detail.get() } // https://w3c.github.io/uievents/#widl-UIEvent-initUIEvent - fn InitUIEvent(self, + fn InitUIEvent(&self, type_: DOMString, can_bubble: bool, cancelable: bool, diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index d8db8329ab1..ec44fe2fdf9 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -84,59 +84,59 @@ impl URL { } } -impl<'a> URLMethods for &'a URL { +impl URLMethods for URL { // https://url.spec.whatwg.org/#dom-urlutils-hash - fn Hash(self) -> USVString { + fn Hash(&self) -> USVString { UrlHelper::Hash(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-host - fn Host(self) -> USVString { + fn Host(&self) -> USVString { UrlHelper::Host(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-hostname - fn Hostname(self) -> USVString { + fn Hostname(&self) -> USVString { UrlHelper::Hostname(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-href - fn Href(self) -> USVString { + fn Href(&self) -> USVString { UrlHelper::Href(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-password - fn Password(self) -> USVString { + fn Password(&self) -> USVString { UrlHelper::Password(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-pathname - fn Pathname(self) -> USVString { + fn Pathname(&self) -> USVString { UrlHelper::Pathname(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-port - fn Port(self) -> USVString { + fn Port(&self) -> USVString { UrlHelper::Port(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-protocol - fn Protocol(self) -> USVString { + fn Protocol(&self) -> USVString { UrlHelper::Protocol(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-search - fn Search(self) -> USVString { + fn Search(&self) -> USVString { UrlHelper::Search(&self.url) } // https://url.spec.whatwg.org/#URLUtils-stringification-behavior - fn Stringifier(self) -> DOMString { + fn Stringifier(&self) -> DOMString { self.Href().0 } // https://url.spec.whatwg.org/#dom-urlutils-username - fn Username(self) -> USVString { + fn Username(&self) -> USVString { UrlHelper::Username(&self.url) } } diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index 29684ec7a38..3c5b7800434 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -58,9 +58,9 @@ impl URLSearchParams { } } -impl<'a> URLSearchParamsMethods for &'a URLSearchParams { +impl URLSearchParamsMethods for URLSearchParams { // https://url.spec.whatwg.org/#dom-urlsearchparams-append - fn Append(self, name: DOMString, value: DOMString) { + fn Append(&self, name: DOMString, value: DOMString) { // Step 1. self.list.borrow_mut().push((name, value)); // Step 2. @@ -68,7 +68,7 @@ impl<'a> URLSearchParamsMethods for &'a URLSearchParams { } // https://url.spec.whatwg.org/#dom-urlsearchparams-delete - fn Delete(self, name: DOMString) { + fn Delete(&self, name: DOMString) { // Step 1. self.list.borrow_mut().retain(|&(ref k, _)| k != &name); // Step 2. @@ -76,7 +76,7 @@ impl<'a> URLSearchParamsMethods for &'a URLSearchParams { } // https://url.spec.whatwg.org/#dom-urlsearchparams-get - fn Get(self, name: DOMString) -> Option<DOMString> { + fn Get(&self, name: DOMString) -> Option<DOMString> { let list = self.list.borrow(); list.iter().filter_map(|&(ref k, ref v)| { if k == &name { @@ -88,13 +88,13 @@ impl<'a> URLSearchParamsMethods for &'a URLSearchParams { } // https://url.spec.whatwg.org/#dom-urlsearchparams-has - fn Has(self, name: DOMString) -> bool { + fn Has(&self, name: DOMString) -> bool { let list = self.list.borrow(); list.iter().find(|&&(ref k, _)| k == &name).is_some() } // https://url.spec.whatwg.org/#dom-urlsearchparams-set - fn Set(self, name: DOMString, value: DOMString) { + fn Set(&self, name: DOMString, value: DOMString) { let mut list = self.list.borrow_mut(); let mut index = None; let mut i = 0; @@ -118,7 +118,7 @@ impl<'a> URLSearchParamsMethods for &'a URLSearchParams { } // https://url.spec.whatwg.org/#stringification-behavior - fn Stringifier(self) -> DOMString { + fn Stringifier(&self) -> DOMString { self.serialize(None) } } diff --git a/components/script/dom/webglactiveinfo.rs b/components/script/dom/webglactiveinfo.rs index 5d6ed75fe92..efac59725b5 100644 --- a/components/script/dom/webglactiveinfo.rs +++ b/components/script/dom/webglactiveinfo.rs @@ -34,19 +34,19 @@ impl WebGLActiveInfo { } } -impl<'a> WebGLActiveInfoMethods for &'a WebGLActiveInfo { +impl WebGLActiveInfoMethods for WebGLActiveInfo { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.11.1 - fn Size(self) -> i32 { + fn Size(&self) -> i32 { self.size } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.11.1 - fn Type(self) -> u32 { + fn Type(&self) -> u32 { self.ty } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.11.1 - fn Name(self) -> DOMString { + fn Name(&self) -> DOMString { self.name.clone() } } diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 0ad3d35f45b..799b088a792 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -143,14 +143,14 @@ impl Drop for WebGLRenderingContext { } } -impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { +impl WebGLRenderingContextMethods for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 - fn Canvas(self) -> Root<HTMLCanvasElement> { + fn Canvas(&self) -> Root<HTMLCanvasElement> { self.canvas.root() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 - fn DrawingBufferWidth(self) -> i32 { + fn DrawingBufferWidth(&self) -> i32 { let (sender, receiver) = ipc::channel().unwrap(); self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::DrawingBufferWidth(sender))) @@ -159,7 +159,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 - fn DrawingBufferHeight(self) -> i32 { + fn DrawingBufferHeight(&self) -> i32 { let (sender, receiver) = ipc::channel().unwrap(); self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::DrawingBufferHeight(sender))) @@ -168,7 +168,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn GetParameter(self, cx: *mut JSContext, parameter: u32) -> JSVal { + fn GetParameter(&self, cx: *mut JSContext, parameter: u32) -> JSVal { // TODO(ecoal95): Implement the missing parameters from the spec let mut rval = RootedValue::new(cx, UndefinedValue()); match parameter { @@ -183,7 +183,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn GetError(self) -> u32 { + fn GetError(&self) -> u32 { let error_code = if let Some(error) = self.last_error.get() { match error { WebGLError::InvalidEnum => constants::INVALID_ENUM, @@ -200,7 +200,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.2 - fn GetContextAttributes(self) -> Option<WebGLContextAttributes> { + fn GetContextAttributes(&self) -> Option<WebGLContextAttributes> { let (sender, receiver) = ipc::channel().unwrap(); // If the send does not succeed, assume context lost @@ -223,49 +223,49 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.14 - fn GetExtension(self, _cx: *mut JSContext, _name: DOMString) -> *mut JSObject { + fn GetExtension(&self, _cx: *mut JSContext, _name: DOMString) -> *mut JSObject { // TODO(ecoal95) we actually do not support extensions. // `getSupportedExtensions` cannot be implemented as of right now (see #544) 0 as *mut JSObject } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn ActiveTexture(self, texture: u32) { + fn ActiveTexture(&self, texture: u32) { self.ipc_renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::ActiveTexture(texture))).unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn BlendColor(self, r: f32, g: f32, b: f32, a: f32) { + fn BlendColor(&self, r: f32, g: f32, b: f32, a: f32) { self.ipc_renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendColor(r, g, b, a))).unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn BlendEquation(self, mode: u32) { + fn BlendEquation(&self, mode: u32) { self.ipc_renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendEquation(mode))).unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn BlendEquationSeparate(self, mode_rgb: u32, mode_alpha: u32) { + fn BlendEquationSeparate(&self, mode_rgb: u32, mode_alpha: u32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendEquationSeparate(mode_rgb, mode_alpha))) .unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn BlendFunc(self, src_factor: u32, dest_factor: u32) { + fn BlendFunc(&self, src_factor: u32, dest_factor: u32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::BlendFunc(src_factor, dest_factor))) .unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn BlendFuncSeparate(self, src_rgb: u32, dest_rgb: u32, src_alpha: u32, dest_alpha: u32) { + fn BlendFuncSeparate(&self, src_rgb: u32, dest_rgb: u32, src_alpha: u32, dest_alpha: u32) { self.ipc_renderer.send( CanvasMsg::WebGL(CanvasWebGLMsg::BlendFuncSeparate(src_rgb, dest_rgb, src_alpha, dest_alpha))).unwrap(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn AttachShader(self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { + fn AttachShader(&self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) { if let Some(program) = program { if let Some(shader) = shader { handle_potential_webgl_error!(self, program.attach_shader(shader)); @@ -274,7 +274,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 - fn BindBuffer(self, target: u32, buffer: Option<&WebGLBuffer>) { + fn BindBuffer(&self, target: u32, buffer: Option<&WebGLBuffer>) { match target { constants::ARRAY_BUFFER | constants::ELEMENT_ARRAY_BUFFER => (), @@ -293,7 +293,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6 - fn BindFramebuffer(self, target: u32, framebuffer: Option<&WebGLFramebuffer>) { + fn BindFramebuffer(&self, target: u32, framebuffer: Option<&WebGLFramebuffer>) { if target != constants::FRAMEBUFFER { return self.webgl_error(InvalidOperation); } @@ -308,7 +308,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7 - fn BindRenderbuffer(self, target: u32, renderbuffer: Option<&WebGLRenderbuffer>) { + fn BindRenderbuffer(&self, target: u32, renderbuffer: Option<&WebGLRenderbuffer>) { if target != constants::RENDERBUFFER { return self.webgl_error(InvalidEnum); } @@ -324,7 +324,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn BindTexture(self, target: u32, texture: Option<&WebGLTexture>) { + fn BindTexture(&self, target: u32, texture: Option<&WebGLTexture>) { let slot = match target { constants::TEXTURE_2D => &self.bound_texture_2d, constants::TEXTURE_CUBE_MAP => &self.bound_texture_cube_map, @@ -347,7 +347,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 - fn BufferData(self, _cx: *mut JSContext, target: u32, data: Option<*mut JSObject>, usage: u32) { + fn BufferData(&self, _cx: *mut JSContext, target: u32, data: Option<*mut JSObject>, usage: u32) { let data = match data { Some(data) => data, None => return, @@ -369,41 +369,41 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11 - fn Clear(self, mask: u32) { + fn Clear(&self, mask: u32) { self.ipc_renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::Clear(mask))).unwrap(); self.mark_as_dirty(); } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn ClearColor(self, red: f32, green: f32, blue: f32, alpha: f32) { + fn ClearColor(&self, red: f32, green: f32, blue: f32, alpha: f32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::ClearColor(red, green, blue, alpha))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn ClearDepth(self, depth: f32) { + fn ClearDepth(&self, depth: f32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::ClearDepth(depth as f64))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn ClearStencil(self, stencil: i32) { + fn ClearStencil(&self, stencil: i32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::ClearStencil(stencil))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn ColorMask(self, r: bool, g: bool, b: bool, a: bool) { + fn ColorMask(&self, r: bool, g: bool, b: bool, a: bool) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::ColorMask(r, g, b, a))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn CullFace(self, mode: u32) { + fn CullFace(&self, mode: u32) { match mode { constants::FRONT | constants::BACK | constants::FRONT_AND_BACK => self.ipc_renderer @@ -414,7 +414,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn FrontFace(self, mode: u32) { + fn FrontFace(&self, mode: u32) { match mode { constants::CW | constants::CCW => self.ipc_renderer @@ -424,7 +424,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn DepthFunc(self, func: u32) { + fn DepthFunc(&self, func: u32) { match func { constants::NEVER | constants::LESS | constants::EQUAL | constants::LEQUAL | @@ -438,21 +438,21 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn DepthMask(self, flag: bool) { + fn DepthMask(&self, flag: bool) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::DepthMask(flag))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn DepthRange(self, near: f32, far: f32) { + fn DepthRange(&self, near: f32, far: f32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::DepthRange(near as f64, far as f64))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn Enable(self, cap: u32) { + fn Enable(&self, cap: u32) { match cap { constants::BLEND | constants::CULL_FACE | constants::DEPTH_TEST | constants::DITHER | constants::POLYGON_OFFSET_FILL | constants::SAMPLE_ALPHA_TO_COVERAGE | constants::SAMPLE_COVERAGE | @@ -465,7 +465,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn Disable(self, cap: u32) { + fn Disable(&self, cap: u32) { match cap { constants::BLEND | constants::CULL_FACE | constants::DEPTH_TEST | constants::DITHER | constants::POLYGON_OFFSET_FILL | constants::SAMPLE_ALPHA_TO_COVERAGE | constants::SAMPLE_COVERAGE | @@ -478,7 +478,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn CompileShader(self, shader: Option<&WebGLShader>) { + fn CompileShader(&self, shader: Option<&WebGLShader>) { if let Some(shader) = shader { shader.compile() } @@ -487,81 +487,81 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { // TODO(ecoal95): Probably in the future we should keep track of the // generated objects, either here or in the webgl task // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 - fn CreateBuffer(self) -> Option<Root<WebGLBuffer>> { + fn CreateBuffer(&self) -> Option<Root<WebGLBuffer>> { WebGLBuffer::maybe_new(self.global.root().r(), self.ipc_renderer.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6 - fn CreateFramebuffer(self) -> Option<Root<WebGLFramebuffer>> { + fn CreateFramebuffer(&self) -> Option<Root<WebGLFramebuffer>> { WebGLFramebuffer::maybe_new(self.global.root().r(), self.ipc_renderer.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7 - fn CreateRenderbuffer(self) -> Option<Root<WebGLRenderbuffer>> { + fn CreateRenderbuffer(&self) -> Option<Root<WebGLRenderbuffer>> { WebGLRenderbuffer::maybe_new(self.global.root().r(), self.ipc_renderer.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn CreateTexture(self) -> Option<Root<WebGLTexture>> { + fn CreateTexture(&self) -> Option<Root<WebGLTexture>> { WebGLTexture::maybe_new(self.global.root().r(), self.ipc_renderer.clone()) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn CreateProgram(self) -> Option<Root<WebGLProgram>> { + fn CreateProgram(&self) -> Option<Root<WebGLProgram>> { WebGLProgram::maybe_new(self.global.root().r(), self.ipc_renderer.clone()) } // TODO(ecoal95): Check if constants are cross-platform or if we must make a translation // between WebGL constants and native ones. // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn CreateShader(self, shader_type: u32) -> Option<Root<WebGLShader>> { + fn CreateShader(&self, shader_type: u32) -> Option<Root<WebGLShader>> { WebGLShader::maybe_new(self.global.root().r(), self.ipc_renderer.clone(), shader_type) } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.5 - fn DeleteBuffer(self, buffer: Option<&WebGLBuffer>) { + fn DeleteBuffer(&self, buffer: Option<&WebGLBuffer>) { if let Some(buffer) = buffer { buffer.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.6 - fn DeleteFramebuffer(self, framebuffer: Option<&WebGLFramebuffer>) { + fn DeleteFramebuffer(&self, framebuffer: Option<&WebGLFramebuffer>) { if let Some(framebuffer) = framebuffer { framebuffer.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.7 - fn DeleteRenderbuffer(self, renderbuffer: Option<&WebGLRenderbuffer>) { + fn DeleteRenderbuffer(&self, renderbuffer: Option<&WebGLRenderbuffer>) { if let Some(renderbuffer) = renderbuffer { renderbuffer.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn DeleteTexture(self, texture: Option<&WebGLTexture>) { + fn DeleteTexture(&self, texture: Option<&WebGLTexture>) { if let Some(texture) = texture { texture.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn DeleteProgram(self, program: Option<&WebGLProgram>) { + fn DeleteProgram(&self, program: Option<&WebGLProgram>) { if let Some(program) = program { program.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn DeleteShader(self, shader: Option<&WebGLShader>) { + fn DeleteShader(&self, shader: Option<&WebGLShader>) { if let Some(shader) = shader { shader.delete() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.11 - fn DrawArrays(self, mode: u32, first: i32, count: i32) { + fn DrawArrays(&self, mode: u32, first: i32, count: i32) { match mode { constants::POINTS | constants::LINE_STRIP | constants::LINE_LOOP | constants::LINES | @@ -583,14 +583,14 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 - fn EnableVertexAttribArray(self, attrib_id: u32) { + fn EnableVertexAttribArray(&self, attrib_id: u32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::EnableVertexAttribArray(attrib_id))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 - fn GetAttribLocation(self, program: Option<&WebGLProgram>, name: DOMString) -> i32 { + fn GetAttribLocation(&self, program: Option<&WebGLProgram>, name: DOMString) -> i32 { if let Some(program) = program { handle_potential_webgl_error!(self, program.get_attrib_location(name), None).unwrap_or(-1) } else { @@ -599,7 +599,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn GetShaderInfoLog(self, shader: Option<&WebGLShader>) -> Option<DOMString> { + fn GetShaderInfoLog(&self, shader: Option<&WebGLShader>) -> Option<DOMString> { if let Some(shader) = shader { shader.info_log() } else { @@ -608,7 +608,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn GetShaderParameter(self, _: *mut JSContext, shader: Option<&WebGLShader>, param_id: u32) -> JSVal { + fn GetShaderParameter(&self, _: *mut JSContext, shader: Option<&WebGLShader>, param_id: u32) -> JSVal { if let Some(shader) = shader { match handle_potential_webgl_error!(self, shader.parameter(param_id), WebGLShaderParameter::Invalid) { WebGLShaderParameter::Int(val) => Int32Value(val), @@ -621,7 +621,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 - fn GetUniformLocation(self, + fn GetUniformLocation(&self, program: Option<&WebGLProgram>, name: DOMString) -> Option<Root<WebGLUniformLocation>> { if let Some(program) = program { @@ -633,7 +633,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn Hint(self, target: u32, mode: u32) { + fn Hint(&self, target: u32, mode: u32) { if target != constants::GENERATE_MIPMAP_HINT { return self.webgl_error(InvalidEnum); } @@ -652,7 +652,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn LineWidth(self, width: f32) { + fn LineWidth(&self, width: f32) { if width.is_nan() || width <= 0f32 { return self.webgl_error(InvalidValue); } @@ -665,7 +665,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { // NOTE: Usage of this function could affect rendering while we keep using // readback to render to the page. // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn PixelStorei(self, param_name: u32, param_value: i32) { + fn PixelStorei(&self, param_name: u32, param_value: i32) { let mut texture_settings = self.texture_unpacking_settings.get(); match param_name { constants::UNPACK_FLIP_Y_WEBGL => { @@ -716,28 +716,28 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3 - fn PolygonOffset(self, factor: f32, units: f32) { + fn PolygonOffset(&self, factor: f32, units: f32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::PolygonOffset(factor, units))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn LinkProgram(self, program: Option<&WebGLProgram>) { + fn LinkProgram(&self, program: Option<&WebGLProgram>) { if let Some(program) = program { program.link() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn ShaderSource(self, shader: Option<&WebGLShader>, source: DOMString) { + fn ShaderSource(&self, shader: Option<&WebGLShader>, source: DOMString) { if let Some(shader) = shader { shader.set_source(source) } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn GetShaderSource(self, shader: Option<&WebGLShader>) -> Option<DOMString> { + fn GetShaderSource(&self, shader: Option<&WebGLShader>) -> Option<DOMString> { if let Some(shader) = shader { shader.source() } else { @@ -747,7 +747,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { #[allow(unsafe_code)] // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 - fn Uniform4fv(self, + fn Uniform4fv(&self, _cx: *mut JSContext, uniform: Option<&WebGLUniformLocation>, data: Option<*mut JSObject>) { @@ -771,14 +771,14 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.9 - fn UseProgram(self, program: Option<&WebGLProgram>) { + fn UseProgram(&self, program: Option<&WebGLProgram>) { if let Some(program) = program { program.use_program() } } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10 - fn VertexAttribPointer(self, attrib_id: u32, size: i32, data_type: u32, + fn VertexAttribPointer(&self, attrib_id: u32, size: i32, data_type: u32, normalized: bool, stride: i32, offset: i64) { if let constants::FLOAT = data_type { let msg = CanvasMsg::WebGL( @@ -790,14 +790,14 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.4 - fn Viewport(self, x: i32, y: i32, width: i32, height: i32) { + fn Viewport(&self, x: i32, y: i32, width: i32, height: i32) { self.ipc_renderer .send(CanvasMsg::WebGL(CanvasWebGLMsg::Viewport(x, y, width, height))) .unwrap() } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn TexImage2D(self, + fn TexImage2D(&self, target: u32, level: i32, internal_format: u32, @@ -868,7 +868,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn TexParameterf(self, target: u32, name: u32, value: f32) { + fn TexParameterf(&self, target: u32, name: u32, value: f32) { match target { constants::TEXTURE_2D | constants::TEXTURE_CUBE_MAP => { @@ -886,7 +886,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext { } // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.8 - fn TexParameteri(self, target: u32, name: u32, value: i32) { + fn TexParameteri(&self, target: u32, name: u32, value: i32) { match target { constants::TEXTURE_2D | constants::TEXTURE_CUBE_MAP => { diff --git a/components/script/dom/webglshaderprecisionformat.rs b/components/script/dom/webglshaderprecisionformat.rs index c37db3991d7..e3b8f473bc5 100644 --- a/components/script/dom/webglshaderprecisionformat.rs +++ b/components/script/dom/webglshaderprecisionformat.rs @@ -38,19 +38,19 @@ impl WebGLShaderPrecisionFormat { } } -impl<'a> WebGLShaderPrecisionFormatMethods for &'a WebGLShaderPrecisionFormat { +impl WebGLShaderPrecisionFormatMethods for WebGLShaderPrecisionFormat { // https://www.khronos.org/registry/webgl/specs/1.0/#5.12.1 - fn RangeMin(self) -> i32 { + fn RangeMin(&self) -> i32 { self.range_min } // https://www.khronos.org/registry/webgl/specs/1.0/#5.12.1 - fn RangeMax(self) -> i32 { + fn RangeMax(&self) -> i32 { self.range_max } // https://www.khronos.org/registry/webgl/specs/1.0/#5.12.1 - fn Precision(self) -> i32 { + fn Precision(&self) -> i32 { self.precision } } diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 59d11e239d2..f92d484c4e5 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -226,34 +226,34 @@ impl WebSocket { } } -impl<'a> WebSocketMethods for &'a WebSocket { +impl WebSocketMethods for WebSocket { event_handler!(open, GetOnopen, SetOnopen); event_handler!(close, GetOnclose, SetOnclose); event_handler!(error, GetOnerror, SetOnerror); event_handler!(message, GetOnmessage, SetOnmessage); // https://html.spec.whatwg.org/multipage/#dom-websocket-url - fn Url(self) -> DOMString { + fn Url(&self) -> DOMString { self.url.serialize() } // https://html.spec.whatwg.org/multipage/#dom-websocket-readystate - fn ReadyState(self) -> u16 { + fn ReadyState(&self) -> u16 { self.ready_state.get() as u16 } // https://html.spec.whatwg.org/multipage/#dom-websocket-binarytype - fn BinaryType(self) -> BinaryType { + fn BinaryType(&self) -> BinaryType { self.binary_type.get() } // https://html.spec.whatwg.org/multipage/#dom-websocket-binarytype - fn SetBinaryType(self, btype: BinaryType) { + fn SetBinaryType(&self, btype: BinaryType) { self.binary_type.set(btype) } // https://html.spec.whatwg.org/multipage/#dom-websocket-send - fn Send(self, data: Option<USVString>) -> Fallible<()> { + fn Send(&self, data: Option<USVString>) -> Fallible<()> { match self.ready_state.get() { WebSocketRequestState::Connecting => { return Err(Error::InvalidState); @@ -280,7 +280,7 @@ impl<'a> WebSocketMethods for &'a WebSocket { } // https://html.spec.whatwg.org/multipage/#dom-websocket-close - fn Close(self, code: Option<u16>, reason: Option<USVString>) -> Fallible<()>{ + fn Close(&self, code: Option<u16>, reason: Option<USVString>) -> Fallible<()>{ fn send_close(this: &WebSocket) { this.ready_state.set(WebSocketRequestState::Closing); diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index cb5cbb09975..8bce4247a4a 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -356,9 +356,9 @@ pub fn base64_atob(input: DOMString) -> Fallible<DOMString> { } } -impl<'a> WindowMethods for &'a Window { +impl WindowMethods for Window { // https://html.spec.whatwg.org/#dom-alert - fn Alert(self, s: DOMString) { + fn Alert(&self, s: DOMString) { // Right now, just print to the console // Ensure that stderr doesn't trample through the alert() we use to // communicate test results. @@ -372,52 +372,52 @@ impl<'a> WindowMethods for &'a Window { } // https://html.spec.whatwg.org/multipage/#dom-window-close - fn Close(self) { + fn Close(&self) { self.main_thread_script_chan().send(MainThreadScriptMsg::ExitWindow(self.id.clone())).unwrap(); } // https://html.spec.whatwg.org/multipage/#dom-document-0 - fn Document(self) -> Root<Document> { + fn Document(&self) -> Root<Document> { self.browsing_context().as_ref().unwrap().active_document() } // https://html.spec.whatwg.org/#dom-location - fn Location(self) -> Root<Location> { + fn Location(&self) -> Root<Location> { self.Document().r().Location() } // https://html.spec.whatwg.org/#dom-sessionstorage - fn SessionStorage(self) -> Root<Storage> { + fn SessionStorage(&self) -> Root<Storage> { self.session_storage.or_init(|| Storage::new(&GlobalRef::Window(self), StorageType::Session)) } // https://html.spec.whatwg.org/#dom-localstorage - fn LocalStorage(self) -> Root<Storage> { + fn LocalStorage(&self) -> Root<Storage> { self.local_storage.or_init(|| Storage::new(&GlobalRef::Window(self), StorageType::Local)) } // https://developer.mozilla.org/en-US/docs/Web/API/Console - fn Console(self) -> Root<Console> { + fn Console(&self) -> Root<Console> { self.console.or_init(|| Console::new(GlobalRef::Window(self))) } // https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#dfn-GlobalCrypto - fn Crypto(self) -> Root<Crypto> { + fn Crypto(&self) -> Root<Crypto> { self.crypto.or_init(|| Crypto::new(GlobalRef::Window(self))) } // https://html.spec.whatwg.org/#dom-frameelement - fn GetFrameElement(self) -> Option<Root<Element>> { + fn GetFrameElement(&self) -> Option<Root<Element>> { self.browsing_context().as_ref().unwrap().frame_element() } // https://html.spec.whatwg.org/#dom-navigator - fn Navigator(self) -> Root<Navigator> { + fn Navigator(&self) -> Root<Navigator> { self.navigator.or_init(|| Navigator::new(self)) } // https://html.spec.whatwg.org/#dom-windowtimers-settimeout - fn SetTimeout(self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetTimeout(&self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::FunctionTimerCallback(callback), args, timeout, @@ -427,7 +427,7 @@ impl<'a> WindowMethods for &'a Window { } // https://html.spec.whatwg.org/#dom-windowtimers-settimeout - fn SetTimeout_(self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetTimeout_(&self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::StringTimerCallback(callback), args, timeout, @@ -437,12 +437,12 @@ impl<'a> WindowMethods for &'a Window { } // https://html.spec.whatwg.org/#dom-windowtimers-cleartimeout - fn ClearTimeout(self, handle: i32) { + fn ClearTimeout(&self, handle: i32) { self.timers.clear_timeout_or_interval(handle); } // https://html.spec.whatwg.org/#dom-windowtimers-setinterval - fn SetInterval(self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetInterval(&self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::FunctionTimerCallback(callback), args, timeout, @@ -452,7 +452,7 @@ impl<'a> WindowMethods for &'a Window { } // https://html.spec.whatwg.org/#dom-windowtimers-setinterval - fn SetInterval_(self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetInterval_(&self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::StringTimerCallback(callback), args, timeout, @@ -462,32 +462,32 @@ impl<'a> WindowMethods for &'a Window { } // https://html.spec.whatwg.org/#dom-windowtimers-clearinterval - fn ClearInterval(self, handle: i32) { + fn ClearInterval(&self, handle: i32) { self.ClearTimeout(handle); } // https://html.spec.whatwg.org/multipage/#dom-window - fn Window(self) -> Root<Window> { + fn Window(&self) -> Root<Window> { Root::from_ref(self) } // https://html.spec.whatwg.org/multipage/#dom-self - fn Self_(self) -> Root<Window> { + fn Self_(&self) -> Root<Window> { self.Window() } // https://www.whatwg.org/html/#dom-frames - fn Frames(self) -> Root<Window> { + fn Frames(&self) -> Root<Window> { self.Window() } // https://html.spec.whatwg.org/multipage/#dom-parent - fn Parent(self) -> Root<Window> { + fn Parent(&self) -> Root<Window> { self.parent().unwrap_or(self.Window()) } // https://html.spec.whatwg.org/multipage/#dom-top - fn Top(self) -> Root<Window> { + fn Top(&self) -> Root<Window> { let mut window = self.Window(); while let Some(parent) = window.parent() { window = parent; @@ -497,7 +497,7 @@ impl<'a> WindowMethods for &'a Window { // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/ // NavigationTiming/Overview.html#sec-window.performance-attribute - fn Performance(self) -> Root<Performance> { + fn Performance(&self) -> Root<Performance> { self.performance.or_init(|| { Performance::new(self, self.navigation_start, self.navigation_start_precise) @@ -509,22 +509,22 @@ impl<'a> WindowMethods for &'a Window { error_event_handler!(error, GetOnerror, SetOnerror); // https://developer.mozilla.org/en-US/docs/Web/API/Window/screen - fn Screen(self) -> Root<Screen> { + fn Screen(&self) -> Root<Screen> { self.screen.or_init(|| Screen::new(self)) } // https://html.spec.whatwg.org/multipage/#dom-windowbase64-btoa - fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> { + fn Btoa(&self, btoa: DOMString) -> Fallible<DOMString> { base64_btoa(btoa) } // https://html.spec.whatwg.org/multipage/#dom-windowbase64-atob - fn Atob(self, atob: DOMString) -> Fallible<DOMString> { + fn Atob(&self, atob: DOMString) -> Fallible<DOMString> { base64_atob(atob) } /// https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe - fn RequestAnimationFrame(self, callback: Rc<FrameRequestCallback>) -> i32 { + fn RequestAnimationFrame(&self, callback: Rc<FrameRequestCallback>) -> i32 { let doc = self.Document(); let callback = move |now: f64| { @@ -537,38 +537,38 @@ impl<'a> WindowMethods for &'a Window { } /// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe - fn CancelAnimationFrame(self, ident: i32) { + fn CancelAnimationFrame(&self, ident: i32) { let doc = self.Document(); doc.r().cancel_animation_frame(ident); } // https://html.spec.whatwg.org/multipage/#dom-window-captureevents - fn CaptureEvents(self) { + fn CaptureEvents(&self) { // This method intentionally does nothing } // https://html.spec.whatwg.org/multipage/#dom-window-releaseevents - fn ReleaseEvents(self) { + fn ReleaseEvents(&self) { // This method intentionally does nothing } // check-tidy: no specs after this line - fn Debug(self, message: DOMString) { + fn Debug(&self, message: DOMString) { debug!("{}", message); } #[allow(unsafe_code)] - fn Gc(self) { + fn Gc(&self) { unsafe { JS_GC(JS_GetRuntime(self.get_cx())); } } - fn Trap(self) { + fn Trap(&self) { breakpoint(); } - fn WebdriverCallback(self, cx: *mut JSContext, val: HandleValue) { + fn WebdriverCallback(&self, cx: *mut JSContext, val: HandleValue) { let rv = jsval_to_webdriver(cx, val); let opt_chan = self.webdriver_script_chan.borrow_mut().take(); if let Some(chan) = opt_chan { @@ -576,7 +576,7 @@ impl<'a> WindowMethods for &'a Window { } } - fn WebdriverTimeout(self) { + fn WebdriverTimeout(&self) { let opt_chan = self.webdriver_script_chan.borrow_mut().take(); if let Some(chan) = opt_chan { chan.send(Err(WebDriverJSError::Timeout)).unwrap(); @@ -584,7 +584,7 @@ impl<'a> WindowMethods for &'a Window { } // https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle - fn GetComputedStyle(self, + fn GetComputedStyle(&self, element: &Element, pseudo: Option<DOMString>) -> Root<CSSStyleDeclaration> { // Steps 1-4. diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 5231a4a0474..d399c9687b4 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -153,9 +153,9 @@ impl Worker { } } -impl<'a> WorkerMethods for &'a Worker { +impl WorkerMethods for Worker { // https://html.spec.whatwg.org/multipage/#dom-dedicatedworkerglobalscope-postmessage - fn PostMessage(self, cx: *mut JSContext, message: HandleValue) -> ErrorResult { + fn PostMessage(&self, cx: *mut JSContext, message: HandleValue) -> ErrorResult { let data = try!(StructuredCloneData::write(cx, message)); let address = Trusted::new(cx, self, self.global.root().r().script_chan().clone()); self.sender.send((address, WorkerScriptMsg::DOMMessage(data))).unwrap(); diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 685137918df..3bc805a67e6 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -161,21 +161,21 @@ impl WorkerGlobalScope { } } -impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { +impl WorkerGlobalScopeMethods for WorkerGlobalScope { // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-self - fn Self_(self) -> Root<WorkerGlobalScope> { + fn Self_(&self) -> Root<WorkerGlobalScope> { Root::from_ref(self) } // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-location - fn Location(self) -> Root<WorkerLocation> { + fn Location(&self) -> Root<WorkerLocation> { self.location.or_init(|| { WorkerLocation::new(self, self.worker_url.clone()) }) } // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts - 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 { let url = UrlParser::new().base_url(&self.worker_url) @@ -208,32 +208,32 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { } // https://html.spec.whatwg.org/multipage/#dom-worker-navigator - fn Navigator(self) -> Root<WorkerNavigator> { + fn Navigator(&self) -> Root<WorkerNavigator> { self.navigator.or_init(|| WorkerNavigator::new(self)) } // https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/console - fn Console(self) -> Root<Console> { + fn Console(&self) -> Root<Console> { self.console.or_init(|| Console::new(GlobalRef::Worker(self))) } // https://html.spec.whatwg.org/multipage/#dfn-Crypto - fn Crypto(self) -> Root<Crypto> { + fn Crypto(&self) -> Root<Crypto> { self.crypto.or_init(|| Crypto::new(GlobalRef::Worker(self))) } // https://html.spec.whatwg.org/multipage/#dom-windowbase64-btoa - fn Btoa(self, btoa: DOMString) -> Fallible<DOMString> { + fn Btoa(&self, btoa: DOMString) -> Fallible<DOMString> { base64_btoa(btoa) } // https://html.spec.whatwg.org/multipage/#dom-windowbase64-atob - fn Atob(self, atob: DOMString) -> Fallible<DOMString> { + fn Atob(&self, atob: DOMString) -> Fallible<DOMString> { base64_atob(atob) } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-setinterval - fn SetTimeout(self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetTimeout(&self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::FunctionTimerCallback(callback), args, timeout, @@ -243,7 +243,7 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-setinterval - fn SetTimeout_(self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetTimeout_(&self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::StringTimerCallback(callback), args, timeout, @@ -253,12 +253,12 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-clearinterval - fn ClearTimeout(self, handle: i32) { + fn ClearTimeout(&self, handle: i32) { self.timers.clear_timeout_or_interval(handle); } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-setinterval - fn SetInterval(self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetInterval(&self, _cx: *mut JSContext, callback: Rc<Function>, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::FunctionTimerCallback(callback), args, timeout, @@ -268,7 +268,7 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-setinterval - fn SetInterval_(self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { + fn SetInterval_(&self, _cx: *mut JSContext, callback: DOMString, timeout: i32, args: Vec<HandleValue>) -> i32 { self.timers.set_timeout_or_interval(TimerCallback::StringTimerCallback(callback), args, timeout, @@ -278,7 +278,7 @@ impl<'a> WorkerGlobalScopeMethods for &'a WorkerGlobalScope { } // https://html.spec.whatwg.org/multipage/#dom-windowtimers-clearinterval - fn ClearInterval(self, handle: i32) { + fn ClearInterval(&self, handle: i32) { self.ClearTimeout(handle); } } diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index 58d30699653..bd62cc57043 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -36,49 +36,49 @@ impl WorkerLocation { } } -impl<'a> WorkerLocationMethods for &'a WorkerLocation { +impl WorkerLocationMethods for WorkerLocation { // https://url.spec.whatwg.org/#dom-urlutils-hash - fn Hash(self) -> USVString { + fn Hash(&self) -> USVString { UrlHelper::Hash(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-host - fn Host(self) -> USVString { + fn Host(&self) -> USVString { UrlHelper::Host(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-hostname - fn Hostname(self) -> USVString { + fn Hostname(&self) -> USVString { UrlHelper::Hostname(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-href - fn Href(self) -> USVString { + fn Href(&self) -> USVString { UrlHelper::Href(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-pathname - fn Pathname(self) -> USVString { + fn Pathname(&self) -> USVString { UrlHelper::Pathname(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-port - fn Port(self) -> USVString { + fn Port(&self) -> USVString { UrlHelper::Port(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-protocol - fn Protocol(self) -> USVString { + fn Protocol(&self) -> USVString { UrlHelper::Protocol(&self.url) } // https://url.spec.whatwg.org/#dom-urlutils-search - fn Search(self) -> USVString { + fn Search(&self) -> USVString { UrlHelper::Search(&self.url) } // https://url.spec.whatwg.org/#URLUtils-stringification-behavior - fn Stringifier(self) -> DOMString { + fn Stringifier(&self) -> DOMString { self.Href().0 } } diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index f8864734c17..6bef4bdb048 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -31,39 +31,39 @@ impl WorkerNavigator { } } -impl<'a> WorkerNavigatorMethods for &'a WorkerNavigator { +impl WorkerNavigatorMethods for WorkerNavigator { // https://html.spec.whatwg.org/multipage/#dom-navigator-product - fn Product(self) -> DOMString { + fn Product(&self) -> DOMString { navigatorinfo::Product() } // https://html.spec.whatwg.org/multipage/#dom-navigator-taintenabled - fn TaintEnabled(self) -> bool { + fn TaintEnabled(&self) -> bool { navigatorinfo::TaintEnabled() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appname - fn AppName(self) -> DOMString { + fn AppName(&self) -> DOMString { navigatorinfo::AppName() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appcodename - fn AppCodeName(self) -> DOMString { + fn AppCodeName(&self) -> DOMString { navigatorinfo::AppCodeName() } // https://html.spec.whatwg.org/multipage/#dom-navigator-platform - fn Platform(self) -> DOMString { + fn Platform(&self) -> DOMString { navigatorinfo::Platform() } // https://html.spec.whatwg.org/multipage/#dom-navigator-useragent - fn UserAgent(self) -> DOMString { + fn UserAgent(&self) -> DOMString { navigatorinfo::UserAgent() } // https://html.spec.whatwg.org/multipage/#dom-navigator-appversion - fn AppVersion(self) -> DOMString { + fn AppVersion(&self) -> DOMString { navigatorinfo::AppVersion() } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 964a3066bfc..f624e79792e 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -291,16 +291,16 @@ impl XMLHttpRequest { } } -impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { +impl XMLHttpRequestMethods for XMLHttpRequest { event_handler!(readystatechange, GetOnreadystatechange, SetOnreadystatechange); // https://xhr.spec.whatwg.org/#dom-xmlhttprequest-readystate - fn ReadyState(self) -> u16 { + fn ReadyState(&self) -> u16 { self.ready_state.get() as u16 } // https://xhr.spec.whatwg.org/#the-open()-method - fn Open(self, method: ByteString, url: DOMString) -> ErrorResult { + fn Open(&self, method: ByteString, url: DOMString) -> ErrorResult { //FIXME(seanmonstar): use a Trie instead? let maybe_method = method.as_str().and_then(|s| { // Note: hyper tests against the uppercase versions @@ -365,14 +365,14 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-open()-method - 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.set(!async); self.Open(method, url) } // https://xhr.spec.whatwg.org/#the-setrequestheader()-method - fn SetRequestHeader(self, name: ByteString, mut value: ByteString) -> ErrorResult { + fn SetRequestHeader(&self, name: ByteString, mut value: ByteString) -> ErrorResult { if self.ready_state.get() != XMLHttpRequestState::Opened || self.send_flag.get() { return Err(InvalidState); // Step 1, 2 } @@ -422,12 +422,12 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-timeout-attribute - fn Timeout(self) -> u32 { + fn Timeout(&self) -> u32 { self.timeout.get() } // https://xhr.spec.whatwg.org/#the-timeout-attribute - fn SetTimeout(self, timeout: u32) -> ErrorResult { + fn SetTimeout(&self, timeout: u32) -> ErrorResult { if self.sync.get() { // FIXME: Not valid for a worker environment Err(InvalidAccess) @@ -451,12 +451,12 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-withcredentials-attribute - fn WithCredentials(self) -> bool { + fn WithCredentials(&self) -> bool { self.with_credentials.get() } // https://xhr.spec.whatwg.org/#dom-xmlhttprequest-withcredentials - fn SetWithCredentials(self, with_credentials: bool) -> ErrorResult { + fn SetWithCredentials(&self, with_credentials: bool) -> ErrorResult { match self.ready_state.get() { XMLHttpRequestState::HeadersReceived | XMLHttpRequestState::Loading | @@ -473,12 +473,12 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-upload-attribute - fn Upload(self) -> Root<XMLHttpRequestUpload> { + fn Upload(&self) -> Root<XMLHttpRequestUpload> { self.upload.root() } // https://xhr.spec.whatwg.org/#the-send()-method - fn Send(self, data: Option<SendParam>) -> ErrorResult { + fn Send(&self, data: Option<SendParam>) -> ErrorResult { if self.ready_state.get() != XMLHttpRequestState::Opened || self.send_flag.get() { return Err(InvalidState); // Step 1, 2 } @@ -610,7 +610,7 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-abort()-method - fn Abort(self) { + fn Abort(&self) { self.terminate_ongoing_fetch(); let state = self.ready_state.get(); if (state == XMLHttpRequestState::Opened && self.send_flag.get()) || @@ -628,22 +628,22 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-responseurl-attribute - fn ResponseURL(self) -> DOMString { + fn ResponseURL(&self) -> DOMString { self.response_url.clone() } // https://xhr.spec.whatwg.org/#the-status-attribute - fn Status(self) -> u16 { + fn Status(&self) -> u16 { self.status.get() } // https://xhr.spec.whatwg.org/#the-statustext-attribute - fn StatusText(self) -> ByteString { + fn StatusText(&self) -> ByteString { self.status_text.borrow().clone() } // https://xhr.spec.whatwg.org/#the-getresponseheader()-method - 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(&h.name().parse().unwrap()) }).map(|h| { @@ -652,17 +652,17 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-getallresponseheaders()-method - fn GetAllResponseHeaders(self) -> ByteString { + fn GetAllResponseHeaders(&self) -> ByteString { ByteString::new(self.filter_response_headers().to_string().into_bytes()) } // https://xhr.spec.whatwg.org/#the-responsetype-attribute - fn ResponseType(self) -> XMLHttpRequestResponseType { + fn ResponseType(&self) -> XMLHttpRequestResponseType { self.response_type.get() } // https://xhr.spec.whatwg.org/#the-responsetype-attribute - fn SetResponseType(self, response_type: XMLHttpRequestResponseType) -> ErrorResult { + fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult { match self.global.root() { GlobalRoot::Worker(_) if response_type == XMLHttpRequestResponseType::Document => return Ok(()), @@ -680,7 +680,7 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { #[allow(unsafe_code)] // https://xhr.spec.whatwg.org/#the-response-attribute - fn Response(self, cx: *mut JSContext) -> JSVal { + fn Response(&self, cx: *mut JSContext) -> JSVal { let mut rval = RootedValue::new(cx, UndefinedValue()); match self.response_type.get() { _empty | Text => { @@ -716,7 +716,7 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-responsetext-attribute - fn GetResponseText(self) -> Fallible<DOMString> { + fn GetResponseText(&self) -> Fallible<DOMString> { match self.response_type.get() { _empty | Text => { match self.ready_state.get() { @@ -729,7 +729,7 @@ impl<'a> XMLHttpRequestMethods for &'a XMLHttpRequest { } // https://xhr.spec.whatwg.org/#the-responsexml-attribute - fn GetResponseXML(self) -> Option<Root<Document>> { + fn GetResponseXML(&self) -> Option<Root<Document>> { self.response_xml.get().map(Root::from_rooted) } } diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs index e771d7d76c0..0e443d65041 100644 --- a/components/script/dom/xmlhttprequesteventtarget.rs +++ b/components/script/dom/xmlhttprequesteventtarget.rs @@ -37,7 +37,7 @@ impl XMLHttpRequestEventTargetDerived for EventTarget { } -impl<'a> XMLHttpRequestEventTargetMethods for &'a XMLHttpRequestEventTarget { +impl XMLHttpRequestEventTargetMethods for XMLHttpRequestEventTarget { event_handler!(loadstart, GetOnloadstart, SetOnloadstart); event_handler!(progress, GetOnprogress, SetOnprogress); event_handler!(abort, GetOnabort, SetOnabort); |