aboutsummaryrefslogtreecommitdiffstats
path: root/components/webrender_traits/lib.rs
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/webrender_traits/lib.rs
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/webrender_traits/lib.rs')
-rw-r--r--components/webrender_traits/lib.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/components/webrender_traits/lib.rs b/components/webrender_traits/lib.rs
index 40d9f0956c3..60492121663 100644
--- a/components/webrender_traits/lib.rs
+++ b/components/webrender_traits/lib.rs
@@ -7,6 +7,7 @@
use euclid::Size2D;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
+use webrender_api::units::TexelRect;
/// This trait is used as a bridge between the different GL clients
/// in Servo that handles WebRender ExternalImages and the WebRender
@@ -117,14 +118,14 @@ impl webrender::ExternalImageHandler for WebrenderExternalImageHandlers {
let (texture_id, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
(
texture_id,
- webrender_api::TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+ TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
)
},
WebrenderImageHandlerType::Media => {
let (texture_id, size) = self.media_handler.as_mut().unwrap().lock(key.0);
(
texture_id,
- webrender_api::TexelRect::new(0.0, 0.0, size.width as f32, size.height as f32),
+ TexelRect::new(0.0, 0.0, size.width as f32, size.height as f32),
)
},
};