Address review comments

Author: gw3583

webrender/src/frame_builder.rs

@@ -193,11 +193,9 @@ impl FrameBuilder {
     pub fn destroy(
         self,
         retained_tiles: &mut FastHashMap<TileDescriptor, TextureCacheHandle>,
-        resource_cache: &ResourceCache,
     ) {
         self.prim_store.destroy(
             retained_tiles,
-            resource_cache,
         );
     }
 

webrender/src/picture.rs

@@ -191,11 +191,8 @@ impl Tile {
 
     /// Destroy a tile, optionally returning a handle and cache descriptor,
     /// if this surface was valid and may be useful on the next scene.
-    fn destroy(
-        self,
-        resource_cache: &ResourceCache,
-    ) -> Option<(TileDescriptor, TextureCacheHandle)> {
-        if self.is_valid && resource_cache.texture_cache.is_allocated(&self.handle) {
+    fn destroy(self) -> Option<(TileDescriptor, TextureCacheHandle)> {
+        if self.is_valid {
             Some((self.descriptor, self.handle))
         } else {
             None
@@ -424,12 +421,6 @@ impl TileCache {
                 // coordinate system (which is the common case!) then we are effectively drawing
                 // in a local space anyway, so don't care about that transform for the purposes
                 // of validating the surface cache contents.
-                let raster_spatial_node = &frame_context
-                    .clip_scroll_tree
-                    .spatial_nodes[raster_spatial_node_index.0];
-                let surface_spatial_node = &frame_context
-                    .clip_scroll_tree
-                    .spatial_nodes[surface_spatial_node_index.0];
 
                 let mut key = CoordinateSpaceMapping::<LayoutPixel, PicturePixel>::new(
                     raster_spatial_node_index,
@@ -438,10 +429,8 @@ impl TileCache {
                 ).expect("bug: unable to get coord mapping").into();
 
                 if let TransformKey::ScaleOffset(ref mut key) = key {
-                    if raster_spatial_node.coordinate_system_id == surface_spatial_node.coordinate_system_id {
-                        key.offset_x = 0.0;
-                        key.offset_y = 0.0;
-                    }
+                    key.offset_x = 0.0;
+                    key.offset_y = 0.0;
                 }
 
                 key
@@ -873,9 +862,7 @@ impl TileCache {
         // TODO(gw): Maybe it's worth keeping them around for a bit longer in
         //           some cases?
         for (_, handle) in retained_tiles.drain() {
-            if resource_cache.texture_cache.is_allocated(&handle) {
-                resource_cache.texture_cache.mark_unused(&handle);
-            }
+            resource_cache.texture_cache.mark_unused(&handle);
         }
 
         self.dirty_region = if dirty_rect.is_empty() {
@@ -1387,14 +1374,11 @@ impl PicturePrimitive {
     pub fn destroy(
         mut self,
         retained_tiles: &mut FastHashMap<TileDescriptor, TextureCacheHandle>,
-        resource_cache: &ResourceCache,
     ) {
         if let Some(tile_cache) = self.tile_cache.take() {
             debug_assert!(tile_cache.old_tiles.is_empty());
             for tile in tile_cache.tiles {
-                if let Some((descriptor, texture_handle)) = tile.destroy(resource_cache) {
-                    retained_tiles.insert(descriptor, texture_handle);
-                }
+                retained_tiles.extend(tile.destroy());
             }
         }
     }

webrender/src/prim_store.rs

@@ -2618,12 +2618,10 @@ impl PrimitiveStore {
     pub fn destroy(
         self,
         retained_tiles: &mut FastHashMap<TileDescriptor, TextureCacheHandle>,
-        resource_cache: &ResourceCache,
     ) {
         for pic in self.pictures {
             pic.destroy(
                 retained_tiles,
-                resource_cache,
             );
         }
     }

webrender/src/render_backend.rs

@@ -506,7 +506,6 @@ impl Document {
     pub fn new_async_scene_ready(
         &mut self,
         mut built_scene: BuiltScene,
-        resource_cache: &ResourceCache,
     ) {
         self.scene = built_scene.scene;
         self.frame_is_valid = false;
@@ -519,7 +518,6 @@ impl Document {
         if let Some(frame_builder) = self.frame_builder.take() {
             frame_builder.destroy(
                 &mut retained_tiles,
-                resource_cache,
             );
         }
 
@@ -763,7 +761,6 @@ impl RenderBackend {
                             if let Some(mut built_scene) = txn.built_scene.take() {
                                 doc.new_async_scene_ready(
                                     built_scene,
-                                    &self.resource_cache,
                                 );
                             }