cc: Only register live tiles with the TileManager

cc/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/picture_layer_tiling.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/math_util.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
@@ skipping 399 matching lines @@
        ++iter) {
     TileMap::iterator find = tiles_.find(iter.index());
     if (find == tiles_.end())
       continue;
 
     TilePriority priority;
     DCHECK(!priority.is_live);
     TileHandle* tile_handle = &find->second;
     Tile* tile = tile_handle->tile();
     tile->set_priority(tree, priority);
+    tile_handle->UnregisterFromTileManager();
   }
   last_prioritized_rect_ = inflated_rect;
 
   gfx::Rect view_rect(device_viewport);
   float current_scale = current_layer_contents_scale / contents_scale_;
   float last_scale = last_layer_contents_scale / contents_scale_;
 
   // Fast path tile priority calculation when both transforms are translations.
   if (last_screen_transform.IsIdentityOrTranslation() &&
       current_screen_transform.IsIdentityOrTranslation())
   {
     gfx::Vector2dF current_offset(
         current_screen_transform.matrix().get(0, 3),
         current_screen_transform.matrix().get(1, 3));
     gfx::Vector2dF last_offset(
         last_screen_transform.matrix().get(0, 3),
         last_screen_transform.matrix().get(1, 3));
 
     for (TilingData::Iterator iter(&tiling_data_, inflated_rect);
          iter; ++iter) {
       TileMap::iterator find = tiles_.find(iter.index());
       if (find == tiles_.end())
         continue;
       TileHandle* tile_handle = &find->second;
       Tile* tile = tile_handle->tile();
+      tile_handle->RegisterWithTileManager();
 
       gfx::Rect tile_bounds =
           tiling_data_.TileBounds(iter.index_x(), iter.index_y());
       gfx::RectF current_screen_rect = gfx::ScaleRect(
           tile_bounds,
           current_scale,
           current_scale) + current_offset;
       gfx::RectF last_screen_rect = gfx::ScaleRect(
           tile_bounds,
           last_scale,
@@ skipping 14 matching lines @@
       tile->set_priority(tree, priority);
     }
   } else {
     for (TilingData::Iterator iter(&tiling_data_, inflated_rect);
          iter; ++iter) {
       TileMap::iterator find = tiles_.find(iter.index());
       if (find == tiles_.end())
         continue;
       TileHandle* tile_handle = &find->second;
       Tile* tile = tile_handle->tile();
+      tile_handle->RegisterWithTileManager();
 
       gfx::Rect tile_bounds =
           tiling_data_.TileBounds(iter.index_x(), iter.index_y());
       gfx::RectF current_layer_content_rect = gfx::ScaleRect(
           tile_bounds,
           current_scale,
           current_scale);
       gfx::RectF current_screen_rect = MathUtil::mapClippedRect(
           current_screen_transform, current_layer_content_rect);
       gfx::RectF last_layer_content_rect = gfx::ScaleRect(
@@ skipping 47 matching lines @@
 
 scoped_ptr<base::Value> PictureLayerTiling::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   state->SetInteger("num_tiles", tiles_.size());
   state->SetDouble("content_scale", contents_scale_);
   state->Set("content_bounds",
              MathUtil::asValue(ContentRect().size()).release());
   return state.PassAs<base::Value>();
 }
 
-TileHandle::TileHandle(scoped_refptr<Tile> tile)
-    : tile_(tile),
-      managed_tile_state_(tile_->tile_manager()->RegisterTile(tile_)) {
+TileHandle::TileHandle(scoped_refptr<Tile> tile) : tile_(tile) {
+}
+
+void TileHandle::RegisterWithTileManager() {
+  if (managed_tile_state_.get())
+    return;
+  managed_tile_state_ = tile_->tile_manager()->RegisterTile(tile_);
+}
+
+void TileHandle::UnregisterFromTileManager() {
+  managed_tile_state_ = NULL;
 }
 
 }  // namespace cc