diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-14 07:25:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 07:25:05 -0700 |
commit | 18653f69581693a5bae1ce4e350e78bc16159b08 (patch) | |
tree | c231afafc66f7f3e2404769e083c176d2a13057d /components/script_traits | |
parent | 5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff) | |
parent | 997608f11f6dfa79291ead25cae46a0538f2a3dc (diff) | |
download | servo-18653f69581693a5bae1ce4e350e78bc16159b08.tar.gz servo-18653f69581693a5bae1ce4e350e78bc16159b08.zip |
Auto merge of #17184 - nical:euclid-bump, r=SimonSapin
Bump euclid to 0.14.x.
- [x] `./mach build -d` does not report any errors (kinda, need webrender published and Cargo.toml fixed up)
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it is a refactoring in which the difference is mostly a compile-time/strong-typing thing with no change to the logic.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17184)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits')
-rw-r--r-- | components/script_traits/Cargo.toml | 4 | ||||
-rw-r--r-- | components/script_traits/lib.rs | 11 | ||||
-rw-r--r-- | components/script_traits/script_msg.rs | 3 | ||||
-rw-r--r-- | components/script_traits/webdriver_msg.rs | 2 |
4 files changed, 7 insertions, 13 deletions
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index ac85cd782ec..ddcf1a3765f 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -15,7 +15,7 @@ bluetooth_traits = {path = "../bluetooth_traits"} canvas_traits = {path = "../canvas_traits"} cookie = "0.6" devtools_traits = {path = "../devtools_traits"} -euclid = "0.13" +euclid = "0.14.4" gfx_traits = {path = "../gfx_traits"} heapsize = "0.4" heapsize_derive = "0.1" @@ -25,7 +25,7 @@ ipc-channel = "0.7" libc = "0.2" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -offscreen_gl_context = "0.8" +offscreen_gl_context = { version = "0.9", features = ["serde"] } profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" serde = "0.9" diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 20433e4f45c..752d4e48b0a 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -44,12 +44,7 @@ pub mod webdriver_msg; use app_units::Au; use bluetooth_traits::BluetoothRequest; use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; -use euclid::Size2D; -use euclid::length::Length; -use euclid::point::Point2D; -use euclid::rect::Rect; -use euclid::scale_factor::ScaleFactor; -use euclid::size::TypedSize2D; +use euclid::{Size2D, Length, Point2D, Vector2D, Rect, ScaleFactor, TypedSize2D}; use gfx_traits::Epoch; use heapsize::HeapSizeOf; use hyper::header::Headers; @@ -254,7 +249,7 @@ pub enum ConstellationControlMsg { /// Notifies script of the viewport. Viewport(PipelineId, Rect<f32>), /// Notifies script of a new set of scroll offsets. - SetScrollState(PipelineId, Vec<(UntrustedNodeAddress, Point2D<f32>)>), + SetScrollState(PipelineId, Vec<(UntrustedNodeAddress, Vector2D<f32>)>), /// Requests that the script thread immediately send the constellation the title of a pipeline. GetTitle(PipelineId), /// Notifies script thread of a change to one of its document's activity @@ -690,7 +685,7 @@ pub struct ScrollState { /// The ID of the scroll root. pub scroll_root_id: ClipId, /// The scrolling offset of this stacking context. - pub scroll_offset: Point2D<f32>, + pub scroll_offset: Vector2D<f32>, } /// One hardware pixel. diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs index d7449f70f29..b9e5b48b4b9 100644 --- a/components/script_traits/script_msg.rs +++ b/components/script_traits/script_msg.rs @@ -14,8 +14,7 @@ use WorkerGlobalScopeInit; use WorkerScriptLoadOrigin; use canvas_traits::CanvasMsg; use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; -use euclid::point::Point2D; -use euclid::size::{Size2D, TypedSize2D}; +use euclid::{Point2D, Size2D, TypedSize2D}; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, FrameType, PipelineId, TraversalDirection}; use msg::constellation_msg::{Key, KeyModifiers, KeyState}; diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs index ed7f2ea8f18..e53e6e77ae3 100644 --- a/components/script_traits/webdriver_msg.rs +++ b/components/script_traits/webdriver_msg.rs @@ -5,7 +5,7 @@ #![allow(missing_docs)] use cookie_rs::Cookie; -use euclid::rect::Rect; +use euclid::Rect; use hyper_serde::Serde; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::BrowsingContextId; |