From be4391585f7069c6bcb9efb364a97bd3554d6a01 Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Wed, 5 Jun 2019 14:06:25 +0000
Subject: [PATCH] Bug 1556597 - Fix warnings in webrender_bindings in nightly
 rust. r=Gankro

Depends on D33782

Differential Revision: https://phabricator.services.mozilla.com/D33783

--HG--
extra : moz-landing-system : lando
---
 gfx/webrender_bindings/src/bindings.rs       | 4 ++--
 gfx/webrender_bindings/src/moz2d_renderer.rs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfx/webrender_bindings/src/bindings.rs b/gfx/webrender_bindings/src/bindings.rs
index cf3b9efa1d898..f2693b99474bc 100644
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -577,7 +577,7 @@ extern "C" {
 }
 
 impl RenderNotifier for CppNotifier {
-    fn clone(&self) -> Box<RenderNotifier> {
+    fn clone(&self) -> Box<dyn RenderNotifier> {
         Box::new(CppNotifier {
             window_id: self.window_id,
         })
@@ -1167,7 +1167,7 @@ pub extern "C" fn wr_window_new(window_id: WrWindowId,
                                 -> bool {
     assert!(unsafe { is_in_render_thread() });
 
-    let recorder: Option<Box<ApiRecordingReceiver>> = if unsafe { gfx_use_wrench() } {
+    let recorder: Option<Box<dyn ApiRecordingReceiver>> = if unsafe { gfx_use_wrench() } {
         let name = format!("wr-record-{}.bin", window_id.0);
         Some(Box::new(BinaryRecorder::new(&PathBuf::from(name))))
     } else {
diff --git a/gfx/webrender_bindings/src/moz2d_renderer.rs b/gfx/webrender_bindings/src/moz2d_renderer.rs
index d24281f8224e2..dcd942fcf49ab 100644
--- a/gfx/webrender_bindings/src/moz2d_renderer.rs
+++ b/gfx/webrender_bindings/src/moz2d_renderer.rs
@@ -590,7 +590,7 @@ impl BlobImageHandler for Moz2dBlobImageHandler {
         self.blob_commands.remove(&key);
     }
 
-    fn create_blob_rasterizer(&mut self) -> Box<AsyncBlobImageRasterizer> {
+    fn create_blob_rasterizer(&mut self) -> Box<dyn AsyncBlobImageRasterizer> {
         Box::new(Moz2dBlobRasterizer {
             workers: Arc::clone(&self.workers),
             blob_commands: self.blob_commands.clone(),
@@ -611,7 +611,7 @@ impl BlobImageHandler for Moz2dBlobImageHandler {
 
     fn prepare_resources(
         &mut self,
-        resources: &BlobImageResources,
+        resources: &dyn BlobImageResources,
         requests: &[BlobImageParams]
     ) {
         for params in requests {
@@ -655,7 +655,7 @@ impl Moz2dBlobImageHandler {
     /// Does early preprocessing of a blob's resources.
     ///
     /// Currently just sets up fonts found in the blob.
-    fn prepare_request(&self, blob: &[u8], resources: &BlobImageResources) {
+    fn prepare_request(&self, blob: &[u8], resources: &dyn BlobImageResources) {
         #[cfg(target_os = "windows")]
         fn process_native_font_handle(key: FontKey, handle: &NativeFontHandle) {
             let file = dwrote::FontFile::new_from_path(&handle.path).unwrap();
@@ -676,7 +676,7 @@ impl Moz2dBlobImageHandler {
 
         fn process_fonts(
             mut extra_data: BufReader,
-            resources: &BlobImageResources,
+            resources: &dyn BlobImageResources,
             unscaled_fonts: &mut Vec<FontKey>,
             scaled_fonts: &mut Vec<FontInstanceKey>,
         ) {