Auto merge of #23827 - emilio:gecko-sync, r=emilio,manishearth

style: Sync changes from mozilla-central, and update euclid

See individual commits for details.

<!-- 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/23827)
<!-- Reviewable:end -->

1 files changed, 4 insertions, 2 deletions

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 07626cc80bd..8193c9b7ace 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -94,7 +94,8 @@ use devtools_traits::CSSError;
 use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo};
 use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
 use embedder_traits::EmbedderMsg;
-use euclid::{Point2D, Rect, Vector2D};
+use euclid::default::{Point2D, Rect};
+use euclid::Vector2D;
 use headers::ReferrerPolicy as ReferrerPolicyHeader;
 use headers::{HeaderMapExt, LastModified};
 use hyper_serde::Serde;
@@ -161,6 +162,7 @@ use style::thread_state::{self, ThreadState};
 use time::{at_utc, get_time, precise_time_ns, Timespec};
 use url::percent_encoding::percent_decode;
 use url::Position;
+use webrender_api::units::LayoutPixel;
 use webrender_api::{DocumentId, RenderApiSender};
 use webvr_traits::{WebVREvent, WebVRMsg};
 
@@ -2230,7 +2232,7 @@ impl ScriptThread {
     fn handle_set_scroll_state(
         &self,
         id: PipelineId,
-        scroll_states: &[(UntrustedNodeAddress, Vector2D<f32>)],
+        scroll_states: &[(UntrustedNodeAddress, Vector2D<f32, LayoutPixel>)],
     ) {
         let window = match { self.documents.borrow().find_window(id) } {
             Some(window) => window,