Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

WR update to 4595561c49939cb21be9554c1b85c244508bde73

Browse source
This commit is contained in:
Dzmitry Malyshau 2017-11-23 14:51:11 -05:00
parent 55049c2a67
commit 8922280b91
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -3669,7 +3669,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender" name = "webrender"
version = "0.54.0" version = "0.54.0"
source = "git+https://github.com/servo/webrender#7753167532643cb7c30fff7bf4234dd908760bf0" source = "git+https://github.com/servo/webrender#4595561c49939cb21be9554c1b85c244508bde73"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3696,7 +3696,7 @@ dependencies = [
[[package]] [[package]]
name = "webrender_api" name = "webrender_api"
version = "0.54.0" version = "0.54.0"
source = "git+https://github.com/servo/webrender#7753167532643cb7c30fff7bf4234dd908760bf0" source = "git+https://github.com/servo/webrender#4595561c49939cb21be9554c1b85c244508bde73"
dependencies = [ dependencies = [
"app_units 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",

2
components/compositing/compositor.rs
View file

@ -769,7 +769,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
warn!("Sending event to constellation failed ({}).", e); 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); let msg = ConstellationMsg::SetCursor(cursor);
if let Err(e) = self.constellation_chan.send(msg) { if let Err(e) = self.constellation_chan.send(msg) {
warn!("Sending event to constellation failed ({}).", e); warn!("Sending event to constellation failed ({}).", e);

4
components/layout/webrender_helpers.rs
View file

@ -253,7 +253,7 @@ impl WebRenderDisplayListConverter for DisplayList {
impl WebRenderDisplayItemConverter for DisplayItem { impl WebRenderDisplayItemConverter for DisplayItem {
fn prim_info(&self) -> webrender_api::LayoutPrimitiveInfo { fn prim_info(&self) -> webrender_api::LayoutPrimitiveInfo {
let tag = match self.base().metadata.pointing { 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, None => None,
}; };
webrender_api::LayoutPrimitiveInfo { webrender_api::LayoutPrimitiveInfo {
@ -261,7 +261,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
local_clip: self.base().local_clip, local_clip: self.base().local_clip,
// TODO(gw): Make use of the WR backface visibility functionality. // TODO(gw): Make use of the WR backface visibility functionality.
is_backface_visible: true, is_backface_visible: true,
tag: tag, tag,
edge_aa_segment_mask: webrender_api::EdgeAaSegmentMask::empty(), edge_aa_segment_mask: webrender_api::EdgeAaSegmentMask::empty(),
} }
} }

1
components/servo/lib.rs
View file

@ -192,7 +192,6 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
resource_override_path: Some(resource_path), resource_override_path: Some(resource_path),
enable_aa: opts.enable_text_antialiasing, enable_aa: opts.enable_text_antialiasing,
debug_flags: debug_flags, debug_flags: debug_flags,
enable_batcher: opts.webrender_batch,
debug: opts.webrender_debug, debug: opts.webrender_debug,
recorder: recorder, recorder: recorder,
precache_shaders: opts.precache_shaders, precache_shaders: opts.precache_shaders,