cc: Don't swap PictureLayerTilingSet on activate.

cc/resources/picture_layer_tiling.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/picture_layer_tiling.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <set>
@@ skipping 87 matching lines @@
 
   tiling_data_.SetTilingSize(content_bounds);
   tiling_data_.SetMaxTextureSize(tile_size);
 }
 
 PictureLayerTiling::~PictureLayerTiling() {
   for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
     it->second->set_shared(false);
 }
 
-void PictureLayerTiling::SetClient(PictureLayerTilingClient* client) {
-  client_ = client;
-}
-
 Tile* PictureLayerTiling::CreateTile(int i,
                                      int j,
                                      const PictureLayerTiling* twin_tiling) {
   TileMapKey key(i, j);
   DCHECK(tiles_.find(key) == tiles_.end());
 
   gfx::Rect paint_rect = tiling_data_.TileBoundsWithBorder(i, j);
   gfx::Rect tile_rect = paint_rect;
   tile_rect.set_size(tiling_data_.max_texture_size());
 
@@ skipping 38 matching lines @@
     TileMapKey key = iter.index();
     TileMap::iterator find = tiles_.find(key);
     if (find != tiles_.end())
       continue;
     CreateTile(key.first, key.second, twin_tiling);
   }
 
   VerifyLiveTilesRect();
 }
 
+void PictureLayerTiling::CreateSharedTilesFromPending(
+    const PictureLayerTiling& other) {
+  DCHECK_EQ(&other, client_->GetPendingOrActiveTwinTiling(this));
+  SetLiveTilesRect(other.live_tiles_rect());
+  DCHECK_EQ(other.tiles_.size(), tiles_.size());
+}
+
 void PictureLayerTiling::UpdateTilesToCurrentRasterSource(
     RasterSource* raster_source,
     const Region& layer_invalidation,
     const gfx::Size& new_layer_bounds) {
   DCHECK(!new_layer_bounds.IsEmpty());
 
   gfx::Size content_bounds =
       gfx::ToCeiledSize(gfx::ScaleSize(new_layer_bounds, contents_scale_));
   gfx::Size tile_size = client_->CalculateTileSize(content_bounds);
 
@@ skipping 23 matching lines @@
 
     int after_right = -1;
     int after_bottom = -1;
     if (!live_tiles_rect_.IsEmpty()) {
       after_right =
           tiling_data_.TileXIndexFromSrcCoord(live_tiles_rect_.right() - 1);
       after_bottom =
           tiling_data_.TileYIndexFromSrcCoord(live_tiles_rect_.bottom() - 1);
     }
 
-    // There is no recycled twin since this is run on the pending tiling.
+    // There is no recycled twin since this is run on the pending tiling
+    // during commit, and on the active tree during activate.
     PictureLayerTiling* recycled_twin = NULL;
     DCHECK_EQ(recycled_twin, client_->GetRecycledTwinTiling(this));
-    DCHECK_EQ(PENDING_TREE, client_->GetTree());
 
     // Drop tiles outside the new layer bounds if the layer shrank.
     for (int i = after_right + 1; i <= before_right; ++i) {
       for (int j = before_top; j <= before_bottom; ++j)
         RemoveTileAt(i, j, recycled_twin);
     }
     for (int i = before_left; i <= after_right; ++i) {
       for (int j = after_bottom + 1; j <= before_bottom; ++j)
         RemoveTileAt(i, j, recycled_twin);
     }
@@ skipping 16 matching lines @@
 
   if (tile_size != tiling_data_.max_texture_size()) {
     tiling_data_.SetMaxTextureSize(tile_size);
     // When the tile size changes, the TilingData positions no longer work
     // as valid keys to the TileMap, so just drop all tiles.
     Reset();
   } else {
     Invalidate(layer_invalidation);
   }
 
-  for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
-    it->second->set_raster_source(raster_source);
+  // Shared (ie. non-invalidated) tiles on the pending tree are updated to use
+  // the new raster source. When this raster source is activated, the raster
+  // source will remain valid for shared tiles in the active tree.
+  // TODO(danakj): Clean this up, pass it in or make it a separate function call
+  // or something.
+  // TODO(danakj): This breaks if we commit to active tree! We really need to do
+  // this for the sync tree.
+  bool set_tiles_to_raster_source = client_->GetTree() == PENDING_TREE;
+  if (set_tiles_to_raster_source) {
+    for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
+      it->second->set_raster_source(raster_source);
+  }
   VerifyLiveTilesRect();
 }
 
-void PictureLayerTiling::RemoveTilesInRegion(const Region& layer_region) {
-  bool recreate_invalidated_tiles = false;
-  DoInvalidate(layer_region, recreate_invalidated_tiles);
-}
-
 void PictureLayerTiling::Invalidate(const Region& layer_region) {
-  bool recreate_invalidated_tiles = true;
-  DoInvalidate(layer_region, recreate_invalidated_tiles);
-}
-
-void PictureLayerTiling::DoInvalidate(const Region& layer_region,
-                                      bool recreate_invalidated_tiles) {
   std::vector<TileMapKey> new_tile_keys;
   gfx::Rect expanded_live_tiles_rect =
       tiling_data_.ExpandRectIgnoringBordersToTileBounds(live_tiles_rect_);
   for (Region::Iterator iter(layer_region); iter.has_rect(); iter.next()) {
     gfx::Rect layer_rect = iter.rect();
     gfx::Rect content_rect =
         gfx::ScaleToEnclosingRect(layer_rect, contents_scale_);
     // Consider tiles inside the live tiles rect even if only their border
     // pixels intersect the invalidation. But don't consider tiles outside
     // the live tiles rect with the same conditions, as they won't exist.
     int border_pixels = tiling_data_.border_texels();
     content_rect.Inset(-border_pixels, -border_pixels);
     // Avoid needless work by not bothering to invalidate where there aren't
     // tiles.
     content_rect.Intersect(expanded_live_tiles_rect);
     if (content_rect.IsEmpty())
       continue;
     // Since the content_rect includes border pixels already, don't include
     // borders when iterating to avoid double counting them.
     bool include_borders = false;
     for (TilingData::Iterator iter(
              &tiling_data_, content_rect, include_borders);
          iter;
          ++iter) {
-      // There is no recycled twin since this is run on the pending tiling.
+      // There is no recycled twin for the peding tree during commit, or for the
+      // active tree during activation.
       PictureLayerTiling* recycled_twin = NULL;
       DCHECK_EQ(recycled_twin, client_->GetRecycledTwinTiling(this));
-      DCHECK_EQ(PENDING_TREE, client_->GetTree());
       if (RemoveTileAt(iter.index_x(), iter.index_y(), recycled_twin))
         new_tile_keys.push_back(iter.index());
     }
   }
 
-  if (recreate_invalidated_tiles && !new_tile_keys.empty()) {
+  if (!new_tile_keys.empty()) {
+    // During commit to the pending tree, invalidations can never be shared with
+    // the active tree since the active tree has different content there.
+    // However, during activation, invalidations on the active tree can be
+    // shared with the pending tree always.
+    const PictureLayerTiling* twin_tiling = nullptr;
+    if (client_->GetTree() == ACTIVE_TREE)
+      twin_tiling = client_->GetPendingOrActiveTwinTiling(this);
     for (size_t i = 0; i < new_tile_keys.size(); ++i) {
-      // Don't try to share a tile with the twin layer, it's been invalidated so
-      // we have to make our own tile here.
-      const PictureLayerTiling* twin_tiling = NULL;
       CreateTile(new_tile_keys[i].first, new_tile_keys[i].second, twin_tiling);
     }
   }
 }
 
 PictureLayerTiling::CoverageIterator::CoverageIterator()
     : tiling_(NULL),
       current_tile_(NULL),
       tile_i_(0),
       tile_j_(0),
@@ skipping 892 matching lines @@
     }
     current_tile_ = tiling_->TileAt(next_index.first, next_index.second);
   }
 
   if (current_tile_)
     tiling_->UpdateTileAndTwinPriority(current_tile_);
   return *this;
 }
 
 }  // namespace cc