Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 40 insertions, 36 deletions

diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs
index 994582f509b..3671df678af 100644
--- a/components/script/dom/canvasgradient.rs
+++ b/components/script/dom/canvasgradient.rs
@@ -1,19 +1,20 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use canvas_traits::{CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle};
-use cssparser::{Parser, RGBA};
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::CanvasGradientBinding::CanvasGradientMethods;
+use crate::dom::bindings::error::{Error, ErrorResult};
+use crate::dom::bindings::num::Finite;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use canvas_traits::canvas::{
+    CanvasGradientStop, FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle,
+};
 use cssparser::Color as CSSColor;
-use dom::bindings::cell::DOMRefCell;
-use dom::bindings::codegen::Bindings::CanvasGradientBinding;
-use dom::bindings::codegen::Bindings::CanvasGradientBinding::CanvasGradientMethods;
-use dom::bindings::error::{Error, ErrorResult};
-use dom::bindings::js::Root;
-use dom::bindings::num::Finite;
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::bindings::str::DOMString;
-use dom::globalscope::GlobalScope;
+use cssparser::{Parser, ParserInput, RGBA};
 use dom_struct::dom_struct;
 
 // https://html.spec.whatwg.org/multipage/#canvasgradient
@@ -21,10 +22,10 @@ use dom_struct::dom_struct;
 pub struct CanvasGradient {
     reflector_: Reflector,
     style: CanvasGradientStyle,
-    stops: DOMRefCell<Vec<CanvasGradientStop>>,
+    stops: DomRefCell<Vec<CanvasGradientStop>>,
 }
 
-#[derive(JSTraceable, Clone, HeapSizeOf)]
+#[derive(Clone, JSTraceable, MallocSizeOf)]
 pub enum CanvasGradientStyle {
     Linear(LinearGradientStyle),
     Radial(RadialGradientStyle),
@@ -35,14 +36,12 @@ impl CanvasGradient {
         CanvasGradient {
             reflector_: Reflector::new(),
             style: style,
-            stops: DOMRefCell::new(Vec::new()),
+            stops: DomRefCell::new(Vec::new()),
         }
     }
 
-    pub fn new(global: &GlobalScope, style: CanvasGradientStyle) -> Root<CanvasGradient> {
-        reflect_dom_object(box CanvasGradient::new_inherited(style),
-                           global,
-                           CanvasGradientBinding::Wrap)
+    pub fn new(global: &GlobalScope, style: CanvasGradientStyle) -> DomRoot<CanvasGradient> {
+        reflect_dom_object(Box::new(CanvasGradient::new_inherited(style)), global)
     }
 }
 
@@ -53,16 +52,17 @@ impl CanvasGradientMethods for CanvasGradient {
             return Err(Error::IndexSize);
         }
 
-        let mut parser = Parser::new(&color);
+        let mut input = ParserInput::new(&color);
+        let mut parser = Parser::new(&mut input);
         let color = CSSColor::parse(&mut parser);
         let color = if parser.is_exhausted() {
             match color {
                 Ok(CSSColor::RGBA(rgba)) => rgba,
                 Ok(CSSColor::CurrentColor) => RGBA::new(0, 0, 0, 255),
-                _ => return Err(Error::Syntax)
+                _ => return Err(Error::Syntax),
             }
         } else {
-            return Err(Error::Syntax)
+            return Err(Error::Syntax);
         };
 
         self.stops.borrow_mut().push(CanvasGradientStop {
@@ -82,21 +82,25 @@ impl<'a> ToFillOrStrokeStyle for &'a CanvasGradient {
         let gradient_stops = self.stops.borrow().clone();
         match self.style {
             CanvasGradientStyle::Linear(ref gradient) => {
-                FillOrStrokeStyle::LinearGradient(LinearGradientStyle::new(gradient.x0,
-                                                                           gradient.y0,
-                                                                           gradient.x1,
-                                                                           gradient.y1,
-                                                                           gradient_stops))
-            }
+                FillOrStrokeStyle::LinearGradient(LinearGradientStyle::new(
+                    gradient.x0,
+                    gradient.y0,
+                    gradient.x1,
+                    gradient.y1,
+                    gradient_stops,
+                ))
+            },
             CanvasGradientStyle::Radial(ref gradient) => {
-                FillOrStrokeStyle::RadialGradient(RadialGradientStyle::new(gradient.x0,
-                                                                           gradient.y0,
-                                                                           gradient.r0,
-                                                                           gradient.x1,
-                                                                           gradient.y1,
-                                                                           gradient.r1,
-                                                                           gradient_stops))
-            }
+                FillOrStrokeStyle::RadialGradient(RadialGradientStyle::new(
+                    gradient.x0,
+                    gradient.y0,
+                    gradient.r0,
+                    gradient.x1,
+                    gradient.y1,
+                    gradient.r1,
+                    gradient_stops,
+                ))
+            },
         }
     }
 }