aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-07-12 08:10:31 -0400
committerGitHub <noreply@github.com>2019-07-12 08:10:31 -0400
commitdf73c71fb18c144abedd6889c34dd1031ffcbb8e (patch)
treea5d41e6bf6a78b390fb7e0b2bb1f5ed22c936c64 /components/script/dom
parent026e550d3536115b23ad794e08b3c93147913dfb (diff)
parent30ea2827209c3c6982c4552c7d3f1193883025b1 (diff)
downloadservo-df73c71fb18c144abedd6889c34dd1031ffcbb8e.tar.gz
servo-df73c71fb18c144abedd6889c34dd1031ffcbb8e.zip
Auto merge of #23516 - pcwalton:webrenderup, r=pcwalton,jdm
Upgrade WebRender This is against an old Servo because I can't build current Servo due to compile errors in RNG crates. I verified that it starts up. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #23516 - [x] There are tests for these changes <!-- 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/23516) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/screen.rs2
-rw-r--r--components/script/dom/window.rs3
2 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs
index a7cf8160114..ff90224d53a 100644
--- a/components/script/dom/screen.rs
+++ b/components/script/dom/screen.rs
@@ -16,7 +16,7 @@ use euclid::TypedSize2D;
use profile_traits::ipc;
use script_traits::ScriptMsg;
use style_traits::CSSPixel;
-use webrender_api::DeviceIntSize;
+use webrender_api::units::DeviceIntSize;
#[dom_struct]
pub struct Screen {
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index e670098ce48..b3d7ac6d726 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -132,7 +132,8 @@ use style::str::HTML_SPACE_CHARACTERS;
use style::stylesheets::CssRuleType;
use style_traits::{CSSPixel, DevicePixel, ParsingMode};
use url::Position;
-use webrender_api::{DeviceIntPoint, DeviceIntSize, DocumentId, ExternalScrollId, RenderApiSender};
+use webrender_api::units::{DeviceIntPoint, DeviceIntSize};
+use webrender_api::{DocumentId, ExternalScrollId, RenderApiSender};
use webvr_traits::WebVRMsg;
/// Current state of the window object