aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/domquad.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom/domquad.rs')
-rw-r--r--components/script/dom/domquad.rs170
1 files changed, 98 insertions, 72 deletions
diff --git a/components/script/dom/domquad.rs b/components/script/dom/domquad.rs
index 8c665731f84..e6decd7e1b2 100644
--- a/components/script/dom/domquad.rs
+++ b/components/script/dom/domquad.rs
@@ -1,117 +1,143 @@
/* 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 dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMethods};
-use dom::bindings::codegen::Bindings::DOMQuadBinding::{DOMQuadInit, DOMQuadMethods, Wrap};
-use dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectInit;
-use dom::bindings::error::Fallible;
-use dom::bindings::js::{Root, JS};
-use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
-use dom::dompoint::DOMPoint;
-use dom::domrect::DOMRect;
-use dom::globalscope::GlobalScope;
+use crate::dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMethods};
+use crate::dom::bindings::codegen::Bindings::DOMQuadBinding::{DOMQuadInit, DOMQuadMethods};
+use crate::dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectInit;
+use crate::dom::bindings::error::Fallible;
+use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
+use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::dompoint::DOMPoint;
+use crate::dom::domrect::DOMRect;
+use crate::dom::globalscope::GlobalScope;
use dom_struct::dom_struct;
// https://drafts.fxtf.org/geometry/#DOMQuad
#[dom_struct]
pub struct DOMQuad {
reflector_: Reflector,
- p1: JS<DOMPoint>,
- p2: JS<DOMPoint>,
- p3: JS<DOMPoint>,
- p4: JS<DOMPoint>,
+ p1: Dom<DOMPoint>,
+ p2: Dom<DOMPoint>,
+ p3: Dom<DOMPoint>,
+ p4: Dom<DOMPoint>,
}
+#[allow(non_snake_case)]
impl DOMQuad {
- fn new_inherited(p1: &DOMPoint,
- p2: &DOMPoint,
- p3: &DOMPoint,
- p4: &DOMPoint)
- -> DOMQuad {
+ fn new_inherited(p1: &DOMPoint, p2: &DOMPoint, p3: &DOMPoint, p4: &DOMPoint) -> DOMQuad {
DOMQuad {
reflector_: Reflector::new(),
- p1: JS::from_ref(p1),
- p2: JS::from_ref(p2),
- p3: JS::from_ref(p3),
- p4: JS::from_ref(p4),
+ p1: Dom::from_ref(p1),
+ p2: Dom::from_ref(p2),
+ p3: Dom::from_ref(p3),
+ p4: Dom::from_ref(p4),
}
}
- pub fn new(global: &GlobalScope,
- p1: &DOMPoint,
- p2: &DOMPoint,
- p3: &DOMPoint,
- p4: &DOMPoint) -> Root<DOMQuad> {
- reflect_dom_object(box DOMQuad::new_inherited(p1, p2, p3, p4),
- global,
- Wrap)
+ pub fn new(
+ global: &GlobalScope,
+ p1: &DOMPoint,
+ p2: &DOMPoint,
+ p3: &DOMPoint,
+ p4: &DOMPoint,
+ ) -> DomRoot<DOMQuad> {
+ reflect_dom_object(Box::new(DOMQuad::new_inherited(p1, p2, p3, p4)), global)
}
- pub fn Constructor(global: &GlobalScope,
- p1: &DOMPointInit,
- p2: &DOMPointInit,
- p3: &DOMPointInit,
- p4: &DOMPointInit)
- -> Fallible<Root<DOMQuad>> {
- Ok(DOMQuad::new(global,
- &*DOMPoint::new_from_init(global, p1),
- &*DOMPoint::new_from_init(global, p2),
- &*DOMPoint::new_from_init(global, p3),
- &*DOMPoint::new_from_init(global, p4)))
+ pub fn Constructor(
+ global: &GlobalScope,
+ p1: &DOMPointInit,
+ p2: &DOMPointInit,
+ p3: &DOMPointInit,
+ p4: &DOMPointInit,
+ ) -> Fallible<DomRoot<DOMQuad>> {
+ Ok(DOMQuad::new(
+ global,
+ &*DOMPoint::new_from_init(global, p1),
+ &*DOMPoint::new_from_init(global, p2),
+ &*DOMPoint::new_from_init(global, p3),
+ &*DOMPoint::new_from_init(global, p4),
+ ))
}
// https://drafts.fxtf.org/geometry/#dom-domquad-fromrect
- 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),
- &*DOMPoint::new(global, other.x + other.width, other.y + other.height, 0f64, 1f64),
- &*DOMPoint::new(global, other.x, other.y + other.height, 0f64, 1f64))
+ pub fn FromRect(global: &GlobalScope, other: &DOMRectInit) -> DomRoot<DOMQuad> {
+ DOMQuad::new(
+ global,
+ &*DOMPoint::new(global, other.x, other.y, 0f64, 1f64),
+ &*DOMPoint::new(global, other.x + other.width, other.y, 0f64, 1f64),
+ &*DOMPoint::new(
+ global,
+ other.x + other.width,
+ other.y + other.height,
+ 0f64,
+ 1f64,
+ ),
+ &*DOMPoint::new(global, other.x, other.y + other.height, 0f64, 1f64),
+ )
}
// https://drafts.fxtf.org/geometry/#dom-domquad-fromquad
- 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),
- &DOMPoint::new_from_init(global, &other.p3),
- &DOMPoint::new_from_init(global, &other.p4))
+ pub fn FromQuad(global: &GlobalScope, other: &DOMQuadInit) -> DomRoot<DOMQuad> {
+ DOMQuad::new(
+ global,
+ &DOMPoint::new_from_init(global, &other.p1),
+ &DOMPoint::new_from_init(global, &other.p2),
+ &DOMPoint::new_from_init(global, &other.p3),
+ &DOMPoint::new_from_init(global, &other.p4),
+ )
}
}
impl DOMQuadMethods for DOMQuad {
// https://drafts.fxtf.org/geometry/#dom-domquad-p1
- fn P1(&self) -> Root<DOMPoint> {
- Root::from_ref(&self.p1)
+ fn P1(&self) -> DomRoot<DOMPoint> {
+ DomRoot::from_ref(&self.p1)
}
// https://drafts.fxtf.org/geometry/#dom-domquad-p2
- fn P2(&self) -> Root<DOMPoint> {
- Root::from_ref(&self.p2)
+ fn P2(&self) -> DomRoot<DOMPoint> {
+ DomRoot::from_ref(&self.p2)
}
// https://drafts.fxtf.org/geometry/#dom-domquad-p3
- fn P3(&self) -> Root<DOMPoint> {
- Root::from_ref(&self.p3)
+ fn P3(&self) -> DomRoot<DOMPoint> {
+ DomRoot::from_ref(&self.p3)
}
// https://drafts.fxtf.org/geometry/#dom-domquad-p4
- fn P4(&self) -> Root<DOMPoint> {
- Root::from_ref(&self.p4)
+ fn P4(&self) -> DomRoot<DOMPoint> {
+ DomRoot::from_ref(&self.p4)
}
// https://drafts.fxtf.org/geometry/#dom-domquad-getbounds
- fn GetBounds(&self) -> Root<DOMRect> {
- let left = self.p1.X().min(self.p2.X()).min(self.p3.X()).min(self.p4.X());
- let top = self.p1.Y().min(self.p2.Y()).min(self.p3.Y()).min(self.p4.Y());
- 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());
+ fn GetBounds(&self) -> DomRoot<DOMRect> {
+ let left = self
+ .p1
+ .X()
+ .min(self.p2.X())
+ .min(self.p3.X())
+ .min(self.p4.X());
+ let top = self
+ .p1
+ .Y()
+ .min(self.p2.Y())
+ .min(self.p3.Y())
+ .min(self.p4.Y());
+ 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(),
- left,
- top,
- right - left,
- bottom - top)
+ DOMRect::new(&self.global(), left, top, right - left, bottom - top)
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 20:30:06 +0000