diff options
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | components/compositing/compositor.rs | 2 | ||||
| -rw-r--r-- | components/layout/webrender_helpers.rs | 4 | ||||
| -rw-r--r-- | components/servo/lib.rs | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 41145593281..fab4498d21c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3669,7 +3669,7 @@ dependencies = [ [[package]] name = "webrender" version = "0.54.0" -source = "git+https://github.com/servo/webrender#7753167532643cb7c30fff7bf4234dd908760bf0" +source = "git+https://github.com/servo/webrender#4595561c49939cb21be9554c1b85c244508bde73" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3696,7 +3696,7 @@ dependencies = [ [[package]] name = "webrender_api" version = "0.54.0" -source = "git+https://github.com/servo/webrender#7753167532643cb7c30fff7bf4234dd908760bf0" +source = "git+https://github.com/servo/webrender#4595561c49939cb21be9554c1b85c244508bde73" dependencies = [ "app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 09213114109..49e2b58b717 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -769,7 +769,7 @@ impl<Window: WindowMethods> IOCompositor<Window> { warn!("Sending event to constellation failed ({}).", e); } - if let Some(cursor) = Cursor::from_u8(item.tag.1).ok() { + if let Some(cursor) = Cursor::from_u8(item.tag.1 as _).ok() { let msg = ConstellationMsg::SetCursor(cursor); if let Err(e) = self.constellation_chan.send(msg) { warn!("Sending event to constellation failed ({}).", e); diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index 1976c141890..e4db2016fd2 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -253,7 +253,7 @@ impl WebRenderDisplayListConverter for DisplayList { impl WebRenderDisplayItemConverter for DisplayItem { fn prim_info(&self) -> webrender_api::LayoutPrimitiveInfo { let tag = match self.base().metadata.pointing { - Some(cursor) => Some((self.base().metadata.node.0 as u64, cursor as u8)), + Some(cursor) => Some((self.base().metadata.node.0 as u64, cursor as u16)), None => None, }; webrender_api::LayoutPrimitiveInfo { @@ -261,7 +261,7 @@ impl WebRenderDisplayItemConverter for DisplayItem { local_clip: self.base().local_clip, // TODO(gw): Make use of the WR backface visibility functionality. is_backface_visible: true, - tag: tag, + tag, edge_aa_segment_mask: webrender_api::EdgeAaSegmentMask::empty(), } } diff --git a/components/servo/lib.rs b/components/servo/lib.rs index e1df5dde425..092e441535d 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -192,7 +192,6 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static { resource_override_path: Some(resource_path), enable_aa: opts.enable_text_antialiasing, debug_flags: debug_flags, - enable_batcher: opts.webrender_batch, debug: opts.webrender_debug, recorder: recorder, precache_shaders: opts.precache_shaders, |