Use euclid 0.19.3+ exported from webrender_api.

servo · bors-servo · Nov 19, 2018 · Nov 19, 2018 · Nov 19, 2018 · 325d11b3b1fb09151b6ef4fddf4b5cf4c34410b3
commit 325d11b3b1fb09151b6ef4fddf4b5cf4c34410b3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml
@@ -25,7 +25,6 @@ bincode = "1.0"
 bitflags = "1.0"
 byteorder = "1.0"
 cfg-if = "0.1.2"
-euclid = "0.19"
 fxhash = "0.2.1"
 gleam = "0.6.3"
 image = { optional = true, version = "0.20" }

diff --git a/webrender/src/lib.rs b/webrender/src/lib.rs
@@ -159,7 +159,6 @@ extern crate dwrote;
 extern crate app_units;
 extern crate bincode;
 extern crate byteorder;
-extern crate euclid;
 extern crate fxhash;
 extern crate gleam;
 extern crate num_traits;
@@ -202,4 +201,5 @@ pub use renderer::{RendererStats, SceneBuilderHooks, ThreadListener, ShaderPreca
 pub use renderer::MAX_VERTEX_TEXTURE_WIDTH;
 pub use shade::{Shaders, WrShaders};
 pub use webrender_api as api;
-pub use resource_cache::intersect_for_tile;
+pub use webrender_api::euclid;
+pub use resource_cache::intersect_for_tile;
diff --git a/webrender_api/Cargo.toml b/webrender_api/Cargo.toml
@@ -18,7 +18,7 @@ bincode = "1.0"
 bitflags = "1.0"
 byteorder = "1.2.1"
 ipc-channel = {version = "0.11.0", optional = true}
-euclid = { version = "0.19", features = ["serde"] }
+euclid = { version = "0.19.3", features = ["serde"] }
 serde = { version = "=1.0.80", features = ["rc"] }
 serde_derive = { version = "=1.0.80", features = ["deserialize_in_place"] }
 serde_bytes = "0.10"

diff --git a/webrender_api/src/lib.rs b/webrender_api/src/lib.rs
@@ -27,7 +27,7 @@ extern crate core_foundation;
 extern crate core_graphics;
 #[cfg(target_os = "windows")]
 extern crate dwrote;
-extern crate euclid;
+pub extern crate euclid;
 #[cfg(feature = "ipc")]
 extern crate ipc_channel;
 extern crate serde;