diff options
Diffstat (limited to 'components/script/dom/domquad.rs')
-rw-r--r-- | components/script/dom/domquad.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/domquad.rs b/components/script/dom/domquad.rs index a9af14d3d69..7d80dc9d8fd 100644 --- a/components/script/dom/domquad.rs +++ b/components/script/dom/domquad.rs @@ -6,11 +6,11 @@ use dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMe use dom::bindings::codegen::Bindings::DOMQuadBinding::{DOMQuadInit, DOMQuadMethods, Wrap}; use dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectInit; use dom::bindings::error::Fallible; -use dom::bindings::global::GlobalRef; use dom::bindings::js::{Root, JS}; use dom::bindings::reflector::{Reflectable, Reflector, reflect_dom_object}; use dom::dompoint::DOMPoint; use dom::domrect::DOMRect; +use dom::globalscope::GlobalScope; // https://drafts.fxtf.org/geometry/#DOMQuad #[dom_struct] @@ -37,7 +37,7 @@ impl DOMQuad { } } - pub fn new(global: GlobalRef, + pub fn new(global: &GlobalScope, p1: &DOMPoint, p2: &DOMPoint, p3: &DOMPoint, @@ -47,7 +47,7 @@ impl DOMQuad { Wrap) } - pub fn Constructor(global: GlobalRef, + pub fn Constructor(global: &GlobalScope, p1: &DOMPointInit, p2: &DOMPointInit, p3: &DOMPointInit, @@ -61,7 +61,7 @@ impl DOMQuad { } // https://drafts.fxtf.org/geometry/#dom-domquad-fromrect - pub fn FromRect(global: GlobalRef, other: &DOMRectInit) -> Root<DOMQuad> { + pub fn FromRect(global: &GlobalScope, other: &DOMRectInit) -> Root<DOMQuad> { DOMQuad::new(global, &*DOMPoint::new(global, other.x, other.y, 0f64, 1f64), &*DOMPoint::new(global, other.x + other.width, other.y, 0f64, 1f64), @@ -70,7 +70,7 @@ impl DOMQuad { } // https://drafts.fxtf.org/geometry/#dom-domquad-fromquad - pub fn FromQuad(global: GlobalRef, other: &DOMQuadInit) -> Root<DOMQuad> { + pub fn FromQuad(global: &GlobalScope, other: &DOMQuadInit) -> Root<DOMQuad> { DOMQuad::new(global, &DOMPoint::new_from_init(global, &other.p1), &DOMPoint::new_from_init(global, &other.p2), @@ -107,7 +107,7 @@ impl DOMQuadMethods for DOMQuad { let right = self.p1.X().max(self.p2.X()).max(self.p3.X()).max(self.p4.X()); let bottom = self.p1.Y().max(self.p2.Y()).max(self.p3.Y()).max(self.p4.Y()); - DOMRect::new(self.global().r(), + DOMRect::new(&self.global(), left, top, right - left, |