Index: cc/tiles/picture_layer_tiling.cc |
diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc |
index be8a7940f7048522a7e13e928e3b50a4f71c513c..d76c2d167bbae5925915777d35cd4ce8090296d7 100644 |
--- a/cc/tiles/picture_layer_tiling.cc |
+++ b/cc/tiles/picture_layer_tiling.cc |
@@ -141,7 +141,8 @@ void PictureLayerTiling::CreateMissingTilesInLiveTilesRect() { |
// If this is the pending tree, then the active twin tiling may contain |
// the previous content ID of these tiles. In that case, we need only |
// partially raster the tile content. |
- if (tile && invalidation && TilingMatchesTileIndices(active_twin)) { |
+ if (client_->IsPartialRasterEnabled() && tile && invalidation && |
danakj
2015/10/08 15:18:43
can you move this virtual call outside of the loop
ericrk
2015/10/13 23:03:45
this code has been removed.
|
+ TilingMatchesTileIndices(active_twin)) { |
if (const Tile* old_tile = |
active_twin->TileAt(key.index_x, key.index_y)) { |
gfx::Rect tile_rect = tile->content_rect(); |
@@ -338,7 +339,8 @@ void PictureLayerTiling::RemoveTilesInRegion(const Region& layer_invalidation, |
ScopedTilePtr old_tile = TakeTileAt(key.index_x, key.index_y); |
if (recreate_tiles && old_tile) { |
Tile::CreateInfo info = CreateInfoForTile(key.index_x, key.index_y); |
- if (Tile* tile = CreateTile(info)) |
+ Tile* tile = CreateTile(info); |
+ if (client_->IsPartialRasterEnabled() && tile) |
danakj
2015/10/08 15:18:43
ditto
ericrk
2015/10/13 23:03:45
this code has been removed.
|
tile->SetInvalidated(invalid_content_rect, old_tile->id()); |
} |
} |