aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/canvas_state.rs1
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs1
-rw-r--r--components/script/dom/htmlcanvaselement.rs1
-rw-r--r--components/script/dom/imagedata.rs10
-rw-r--r--components/script/dom/paintrenderingcontext2d.rs1
-rw-r--r--components/script/dom/webgl2renderingcontext.rs3
-rw-r--r--components/script/euclidext.rs24
7 files changed, 2 insertions, 39 deletions
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs
index 41c92fc0799..bb87727543a 100644
--- a/components/script/canvas_state.rs
+++ b/components/script/canvas_state.rs
@@ -26,7 +26,6 @@ use crate::dom::node::{Node, NodeDamage};
use crate::dom::offscreencanvas::{OffscreenCanvas, OffscreenCanvasContext};
use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
use crate::dom::textmetrics::TextMetrics;
-use crate::euclidext::Size2DExt;
use crate::unpremultiplytable::UNPREMULTIPLY_TABLE;
use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg};
use canvas_traits::canvas::{CompositionOrBlending, FillOrStrokeStyle, FillRule};
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index bb60a591060..3dff7403464 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -22,7 +22,6 @@ use crate::dom::globalscope::GlobalScope;
use crate::dom::htmlcanvaselement::HTMLCanvasElement;
use crate::dom::imagedata::ImageData;
use crate::dom::textmetrics::TextMetrics;
-use crate::euclidext::Size2DExt;
use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg};
use dom_struct::dom_struct;
use euclid::default::{Point2D, Rect, Size2D};
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index 5864321cb13..a4b628383d7 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -27,7 +27,6 @@ use crate::dom::webgl2renderingcontext::WebGL2RenderingContext;
use crate::dom::webglrenderingcontext::{
LayoutCanvasWebGLRenderingContextHelpers, WebGLRenderingContext,
};
-use crate::euclidext::Size2DExt;
use crate::script_runtime::JSContext;
use base64;
use canvas_traits::canvas::{CanvasId, CanvasMsg, FromScriptMsg};
diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs
index bc605b5f029..39e3b061711 100644
--- a/components/script/dom/imagedata.rs
+++ b/components/script/dom/imagedata.rs
@@ -184,13 +184,3 @@ impl ImageDataMethods for ImageData {
NonNull::new(self.data.get()).expect("got a null pointer")
}
}
-
-pub trait Size2DExt {
- fn to_u64(&self) -> Size2D<u64>;
-}
-
-impl Size2DExt for Size2D<u32> {
- fn to_u64(&self) -> Size2D<u64> {
- return Size2D::new(self.width as u64, self.height as u64);
- }
-}
diff --git a/components/script/dom/paintrenderingcontext2d.rs b/components/script/dom/paintrenderingcontext2d.rs
index 3bcda664280..af9f5cd01b3 100644
--- a/components/script/dom/paintrenderingcontext2d.rs
+++ b/components/script/dom/paintrenderingcontext2d.rs
@@ -21,7 +21,6 @@ use crate::dom::canvaspattern::CanvasPattern;
use crate::dom::canvasrenderingcontext2d::CanvasRenderingContext2D;
use crate::dom::dommatrix::DOMMatrix;
use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope;
-use crate::euclidext::Size2DExt;
use canvas_traits::canvas::CanvasImageData;
use canvas_traits::canvas::CanvasMsg;
use canvas_traits::canvas::FromLayoutMsg;
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index 54c0da20333..fea8b54e849 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -25,8 +25,7 @@ use crate::dom::webglprogram::WebGLProgram;
use crate::dom::webglquery::WebGLQuery;
use crate::dom::webglrenderbuffer::WebGLRenderbuffer;
use crate::dom::webglrenderingcontext::{
- uniform_get, uniform_typed, LayoutCanvasWebGLRenderingContextHelpers, Size2DExt,
- WebGLRenderingContext,
+ uniform_get, uniform_typed, LayoutCanvasWebGLRenderingContextHelpers, WebGLRenderingContext,
};
use crate::dom::webglsampler::{WebGLSampler, WebGLSamplerValue};
use crate::dom::webglshader::WebGLShader;
diff --git a/components/script/euclidext.rs b/components/script/euclidext.rs
index 39de2aa2ccb..c6eb72f89fc 100644
--- a/components/script/euclidext.rs
+++ b/components/script/euclidext.rs
@@ -2,29 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-use euclid::default::{Rect, Size2D};
-
-pub trait Size2DExt {
- fn to_u64(&self) -> Size2D<u64>;
-}
-
-impl Size2DExt for Size2D<f32> {
- fn to_u64(&self) -> Size2D<u64> {
- self.cast()
- }
-}
-
-impl Size2DExt for Size2D<f64> {
- fn to_u64(&self) -> Size2D<u64> {
- self.cast()
- }
-}
-
-impl Size2DExt for Size2D<u32> {
- fn to_u64(&self) -> Size2D<u64> {
- self.cast()
- }
-}
+use euclid::default::Rect;
pub trait RectExt {
fn to_u64(&self) -> Rect<u64>;