Bug 1510085 - Update webrender to commit 05bdcae134d73aca7bb48358e91de1f8aef27773 (WR PR #3354). r=kats
authorWR Updater Bot <graphics-team@mozilla.staktrace.com>
Tue, 27 Nov 2018 02:54:00 +0000
changeset 504612 a12365223e8b4c0eb19eb9e65ebd233069109540
parent 504611 a613bf1190880ef45811a35ab8e6904fe9263192
child 504613 5452c9164d46e49aa8ee6cd3444bb0f8cc7cc121
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1510085
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1510085 - Update webrender to commit 05bdcae134d73aca7bb48358e91de1f8aef27773 (WR PR #3354). r=kats https://github.com/servo/webrender/pull/3354 Differential Revision: https://phabricator.services.mozilla.com/D13029
gfx/webrender_bindings/revision.txt
gfx/wr/webrender/src/resource_cache.rs
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1,1 +1,1 @@
-35027d93aded8c0a7887dadc8aef5e393171e802
+05bdcae134d73aca7bb48358e91de1f8aef27773
--- a/gfx/wr/webrender/src/resource_cache.rs
+++ b/gfx/wr/webrender/src/resource_cache.rs
@@ -789,32 +789,32 @@ impl ResourceCache {
 
         // Each cache entry stores its own copy of the image's dirty rect. This allows them to be
         // updated independently.
         match self.cached_images.try_get_mut(&image_key) {
             Some(&mut ImageResult::UntiledAuto(ref mut entry)) => {
                 entry.dirty_rect = entry.dirty_rect.union(dirty_rect);
             }
             Some(&mut ImageResult::Multi(ref mut entries)) => {
-                let tile_size = tiling.unwrap();
                 for (key, entry) in entries.iter_mut() {
                     // We want the dirty rect relative to the tile and not the whole image.
-                    let local_dirty_rect = match key.tile {
-                        Some(tile) => {
+                    let local_dirty_rect = match (tiling, key.tile) {
+                        (Some(tile_size), Some(tile)) => {
                             dirty_rect.map(|mut rect|{
                                 let tile_offset = DeviceIntPoint::new(
                                     tile.x as i32,
                                     tile.y as i32,
                                 ) * tile_size as i32;
                                 rect.origin -= tile_offset.to_vector();
 
                                 rect
                             })
                         }
-                        None => *dirty_rect,
+                        (None, Some(..)) => DirtyRect::All,
+                        _ => *dirty_rect,
                     };
                     entry.dirty_rect = entry.dirty_rect.union(&local_dirty_rect);
                 }
             }
             _ => {}
         }
 
         *image = ImageResource {