Bug 1511409 - Update webrender to commit dbaa10971f08f964120ba339f5b0…

…ab3e7ace77d6 (WR PR #3374). r=kats servo/webrender#3374 Differential Revision: https://phabricator.services.mozilla.com/D13626
mykmelez · Dec 2, 2018 · 3574e3b · 3574e3b
1 parent 4a0b798
commit 3574e3b
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 297 deletions.
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-5b26863178f8533eeba2de28c6bdc019ba9ed3e8
+dbaa10971f08f964120ba339f5b0ab3e7ace77d6
diff --git a/gfx/wr/Cargo.lock b/gfx/wr/Cargo.lock
diff --git a/gfx/wr/appveyor.yml b/gfx/wr/appveyor.yml
@@ -8,8 +8,8 @@ environment:
   TARGET: x86_64-pc-windows-msvc
 
 install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.27.0-${env:TARGET}.msi"
-  - msiexec /passive /i "rust-1.27.0-%TARGET%.msi" ADDLOCAL=Rustc,Cargo,Std INSTALLDIR=C:\Rust
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.30.0-${env:TARGET}.msi"
+  - msiexec /passive /i "rust-1.30.0-%TARGET%.msi" ADDLOCAL=Rustc,Cargo,Std INSTALLDIR=C:\Rust
   - rustc -V
   - cargo -V
 

diff --git a/gfx/wr/webrender/Cargo.toml b/gfx/wr/webrender/Cargo.toml
@@ -68,6 +68,7 @@ optional = true
 
 [dev-dependencies]
 mozangle = "0.1"
+rand = "0.4"
 
 [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
 freetype = { version = "0.4", default-features = false }

diff --git a/gfx/wr/webrender/src/batch.rs b/gfx/wr/webrender/src/batch.rs
@@ -151,7 +151,8 @@ impl AlphaBatchList {
     ) -> &mut Vec<PrimitiveInstanceData> {
         if z_id != self.current_z_id ||
            self.current_batch_index == usize::MAX ||
-           !self.batches[self.current_batch_index].key.is_compatible_with(&key) {
+           !self.batches[self.current_batch_index].key.is_compatible_with(&key)
+        {
             let mut selected_batch_index = None;
 
             match key.blend_mode {

diff --git a/gfx/wr/webrender/src/lib.rs b/gfx/wr/webrender/src/lib.rs
@@ -190,6 +190,8 @@ extern crate image as image_loader;
 extern crate base64;
 #[cfg(all(feature = "capture", feature = "png"))]
 extern crate png;
+#[cfg(test)]
+extern crate rand;
 
 pub extern crate webrender_api;
 

diff --git a/gfx/wr/webrender/src/render_task.rs b/gfx/wr/webrender/src/render_task.rs
@@ -144,8 +144,12 @@ impl RenderTaskTree {
             pass_index
         };
 
-        let pass = &mut passes[pass_index];
-        pass.add_render_task(id, task.get_dynamic_size(), task.target_kind(), &task.location);
+        passes[pass_index].add_render_task(
+            id,
+            task.get_dynamic_size(),
+            task.target_kind(),
+            &task.location,
+        );
     }
 
     pub fn prepare_for_render(&mut self) {