Skip to content

Commit 519cb16

Browse files
committed
Bug 1511409 - Update webrender to commit dbaa10971f08f964120ba339f5b0ab3e7ace77d6 (WR PR #3374). r=kats
servo/webrender#3374 Differential Revision: https://phabricator.services.mozilla.com/D13626 UltraBlame original commit: be65d09ef059e78daf60df9737503cfcb6dc8a86
1 parent 59e77d7 commit 519cb16

File tree

9 files changed

+257
-293
lines changed

9 files changed

+257
-293
lines changed

gfx/webrender_bindings/revision.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5b26863178f8533eeba2de28c6bdc019ba9ed3e8
1+
dbaa10971f08f964120ba339f5b0ab3e7ace77d6

gfx/wr/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gfx/wr/appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ environment:
88
TARGET: x86_64-pc-windows-msvc
99

1010
install:
11-
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.27.0-${env:TARGET}.msi"
12-
- msiexec /passive /i "rust-1.27.0-%TARGET%.msi" ADDLOCAL=Rustc,Cargo,Std INSTALLDIR=C:\Rust
11+
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.30.0-${env:TARGET}.msi"
12+
- msiexec /passive /i "rust-1.30.0-%TARGET%.msi" ADDLOCAL=Rustc,Cargo,Std INSTALLDIR=C:\Rust
1313
- rustc -V
1414
- cargo -V
1515

gfx/wr/webrender/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ optional = true
6868

6969
[dev-dependencies]
7070
mozangle = "0.1"
71+
rand = "0.4"
7172

7273
[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
7374
freetype = { version = "0.4", default-features = false }

gfx/wr/webrender/src/batch.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ impl AlphaBatchList {
151151
) -> &mut Vec<PrimitiveInstanceData> {
152152
if z_id != self.current_z_id ||
153153
self.current_batch_index == usize::MAX ||
154-
!self.batches[self.current_batch_index].key.is_compatible_with(&key) {
154+
!self.batches[self.current_batch_index].key.is_compatible_with(&key)
155+
{
155156
let mut selected_batch_index = None;
156157

157158
match key.blend_mode {

gfx/wr/webrender/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ extern crate image as image_loader;
190190
extern crate base64;
191191
#[cfg(all(feature = "capture", feature = "png"))]
192192
extern crate png;
193+
#[cfg(test)]
194+
extern crate rand;
193195

194196
pub extern crate webrender_api;
195197

gfx/wr/webrender/src/render_task.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,12 @@ impl RenderTaskTree {
144144
pass_index
145145
};
146146

147-
let pass = &mut passes[pass_index];
148-
pass.add_render_task(id, task.get_dynamic_size(), task.target_kind(), &task.location);
147+
passes[pass_index].add_render_task(
148+
id,
149+
task.get_dynamic_size(),
150+
task.target_kind(),
151+
&task.location,
152+
);
149153
}
150154

151155
pub fn prepare_for_render(&mut self) {

0 commit comments

Comments
 (0)