62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
|
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 ee672ee..6d9dcb2 100644
|
||
|
|
--- a/gfx/webrender_bindings/src/moz2d_renderer.rs
|
||
|
|
+++ b/webrender_bindings/src/moz2d_renderer.rs
|
||
|
|
@@ -365,7 +365,7 @@ impl BlobImageRenderer for Moz2dImageRenderer {
|
||
|
|
}
|
||
|
|
|
||
|
|
fn request(&mut self,
|
||
|
|
- resources: &BlobImageResources,
|
||
|
|
+ resources: &dyn BlobImageResources,
|
||
|
|
request: BlobImageRequest,
|
||
|
|
descriptor: &BlobImageDescriptor,
|
||
|
|
dirty_rect: Option<DeviceUintRect>) {
|
||
|
|
@@ -403,7 +403,7 @@ impl BlobImageRenderer for Moz2dImageRenderer {
|
||
|
|
unsafe { AddNativeFontHandle(key, cstr.as_ptr() as *mut c_void, handle.index) };
|
||
|
|
}
|
||
|
|
|
||
|
|
- fn process_fonts(mut extra_data: BufReader, resources: &BlobImageResources) {
|
||
|
|
+ fn process_fonts(mut extra_data: BufReader, resources: &dyn BlobImageResources) {
|
||
|
|
let font_count = extra_data.read_usize();
|
||
|
|
for _ in 0..font_count {
|
||
|
|
let key = extra_data.read_font_key();
|