diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-06-18 20:50:22 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-06-18 20:50:22 -0600 |
commit | 4ebb95ccd8e034007eacb447a054919ef4af2bf7 (patch) | |
tree | 0a2bdde607bcac3a4deef4df02ab15340242cfd9 /components/script/dom | |
parent | 1926123e51befca8bd9189e5682b9f78af48ad50 (diff) | |
parent | 8cbfb3482c59186742fa8bcf3ec925730914ffc7 (diff) | |
download | servo-4ebb95ccd8e034007eacb447a054919ef4af2bf7.tar.gz servo-4ebb95ccd8e034007eacb447a054919ef4af2bf7.zip |
Auto merge of #6423 - ecoal95:euclid, r=glennw
Use euclid from crates.io
Sorry for not doing it yesterday, I couldn't.
cc @metajack @SimonSapin
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/bindings/trace.rs | 6 | ||||
-rw-r--r-- | components/script/dom/canvaspattern.rs | 2 | ||||
-rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 8 | ||||
-rw-r--r-- | components/script/dom/document.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlcanvaselement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/imagedata.rs | 2 | ||||
-rw-r--r-- | components/script/dom/node.rs | 2 | ||||
-rw-r--r-- | components/script/dom/webglrenderingcontext.rs | 2 | ||||
-rw-r--r-- | components/script/dom/window.rs | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index a4ef3eb6d9b..6a0f72412de 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -38,9 +38,9 @@ use canvas_traits::{CanvasGradientStop, LinearGradientStyle, RadialGradientStyle use canvas_traits::{LineCapStyle, LineJoinStyle, CompositionOrBlending, RepetitionStyle}; use cssparser::RGBA; use encoding::types::EncodingRef; -use geom::matrix2d::Matrix2D; -use geom::rect::Rect; -use geom::size::Size2D; +use euclid::matrix2d::Matrix2D; +use euclid::rect::Rect; +use euclid::size::Size2D; use html5ever::tree_builder::QuirksMode; use hyper::header::Headers; use hyper::method::Method; diff --git a/components/script/dom/canvaspattern.rs b/components/script/dom/canvaspattern.rs index 0be707a1147..b97ba6bb76e 100644 --- a/components/script/dom/canvaspattern.rs +++ b/components/script/dom/canvaspattern.rs @@ -8,7 +8,7 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::canvasgradient::ToFillOrStrokeStyle; -use geom::size::Size2D; +use euclid::size::Size2D; // https://html.spec.whatwg.org/multipage/#canvaspattern #[dom_struct] diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 9ac3a97c55b..06330b48889 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -24,10 +24,10 @@ use dom::node::{window_from_node, NodeHelpers, NodeDamage}; use cssparser::Color as CSSColor; use cssparser::{Parser, RGBA}; -use geom::matrix2d::Matrix2D; -use geom::point::Point2D; -use geom::rect::Rect; -use geom::size::Size2D; +use euclid::matrix2d::Matrix2D; +use euclid::point::Point2D; +use euclid::rect::Rect; +use euclid::size::Size2D; use canvas_traits::{CanvasMsg, Canvas2dMsg, CanvasCommonMsg}; use canvas_traits::{FillOrStrokeStyle, LinearGradientStyle, RadialGradientStyle, RepetitionStyle}; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 18b50faff5d..f009e4d1cdc 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -82,7 +82,7 @@ use util::opts; use util::str::{DOMString, split_html_space_chars}; use layout_interface::{ReflowGoal, ReflowQueryType}; -use geom::point::Point2D; +use euclid::point::Point2D; use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks}; use layout_interface::{LayoutChan, Msg}; use string_cache::{Atom, QualName}; diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index f0367679e25..1b3c8261bd3 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -31,7 +31,7 @@ use js::jsapi::{JSContext}; use js::jsval::JSVal; use offscreen_gl_context::GLContextAttributes; -use geom::size::Size2D; +use euclid::size::Size2D; use std::cell::Cell; use std::default::Default; diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index c935c51adcd..04c99d08a64 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::ImageDataBinding::ImageDataMethods; use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::{Reflector, reflect_dom_object}; -use geom::size::Size2D; +use euclid::size::Size2D; use js::jsapi::{JSContext, JSObject}; use js::jsfriendapi::bindgen::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData}; use libc::uint8_t; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 97a4212f35a..d971028fcec 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -46,7 +46,7 @@ use dom::processinginstruction::{ProcessingInstruction, ProcessingInstructionHel use dom::text::Text; use dom::virtualmethods::{VirtualMethods, vtable_for}; use dom::window::{Window, WindowHelpers}; -use geom::rect::Rect; +use euclid::rect::Rect; use layout_interface::{LayoutChan, Msg}; use devtools_traits::NodeInfo; use parse::html::parse_html_fragment; diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 786a3c25620..a2745aaa143 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -19,7 +19,7 @@ use dom::webgltexture::{WebGLTexture, WebGLTextureHelpers}; use dom::webglshader::{WebGLShader, WebGLShaderHelpers}; use dom::webglprogram::{WebGLProgram, WebGLProgramHelpers}; use dom::webgluniformlocation::{WebGLUniformLocation, WebGLUniformLocationHelpers}; -use geom::size::Size2D; +use euclid::size::Size2D; use js::jsapi::{JSContext, JSObject}; use js::jsfriendapi::bindgen::{JS_GetFloat32ArrayData, JS_GetObjectAsArrayBufferView}; use js::jsval::{JSVal, NullValue, Int32Value}; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index c6de7bcca82..5f1849c436c 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -48,7 +48,7 @@ use util::geometry::{self, Au, MAX_RECT}; use util::opts; use util::str::{DOMString,HTML_SPACE_CHARACTERS}; -use geom::{Point2D, Rect, Size2D}; +use euclid::{Point2D, Rect, Size2D}; use js::jsapi::JS_EvaluateUCScript; use js::jsapi::JSContext; use js::jsapi::{JS_GC, JS_GetRuntime}; |