Auto merge of #19360 - kvark:wr-fix, r=jdm

WR update to 4595561c49939cb21be9554c1b85c244508bde73

<!-- Please describe your changes on the following line: -->

---
<!-- 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 #19347

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because: no new logic

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

cc @glennw

<!-- 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/19360)
<!-- Reviewable:end -->

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)",

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);

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(),
         }
     }

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,