aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_thread.rs
diff options
context:
space:
mode:
authorNicolas Silva <nical@fastmail.com>2017-06-02 14:50:26 +0200
committerNicolas Silva <nical@fastmail.com>2017-06-14 16:00:59 +0200
commit8617320500491fab91979404cec2087bac7ef362 (patch)
tree7db5b5b5a17fb59bb727a2a59ba27f351d01fb90 /components/script/script_thread.rs
parent5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff)
downloadservo-8617320500491fab91979404cec2087bac7ef362.tar.gz
servo-8617320500491fab91979404cec2087bac7ef362.zip
Bump euclid to 0.14.
Diffstat (limited to 'components/script/script_thread.rs')
-rw-r--r--components/script/script_thread.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index fcb351cebb2..941d80293f6 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -58,8 +58,7 @@ use dom::windowproxy::WindowProxy;
use dom::worker::TrustedWorkerAddress;
use dom::worklet::WorkletThreadPool;
use dom::workletglobalscope::WorkletGlobalScopeInit;
-use euclid::Rect;
-use euclid::point::Point2D;
+use euclid::{Point2D, Vector2D, Rect};
use hyper::header::{ContentType, HttpDate, Headers, LastModified};
use hyper::header::ReferrerPolicy as ReferrerPolicyHeader;
use hyper::mime::{Mime, SubLevel, TopLevel};
@@ -1339,7 +1338,7 @@ impl ScriptThread {
fn handle_set_scroll_state(&self,
id: PipelineId,
- scroll_states: &[(UntrustedNodeAddress, Point2D<f32>)]) {
+ scroll_states: &[(UntrustedNodeAddress, Vector2D<f32>)]) {
let window = match { self.documents.borrow().find_window(id) } {
Some(window) => window,
None => return warn!("Set scroll state message sent to nonexistent pipeline: {:?}", id),
@@ -1350,8 +1349,7 @@ impl ScriptThread {
if node_address == UntrustedNodeAddress(ptr::null()) {
window.update_viewport_for_scroll(-scroll_offset.x, -scroll_offset.y);
} else {
- scroll_offsets.insert(node_address,
- Point2D::new(-scroll_offset.x, -scroll_offset.y));
+ scroll_offsets.insert(node_address, -*scroll_offset);
}
}
window.set_scroll_offsets(scroll_offsets)