cc: Remove unused Tile ctor parameter (raster_source).

Raster source moved to be in PrioritizedTile returned by the priority
queues. This patch cleans up the ctor to remove the now unused raster
source parameter.

R=hendrikw

Review URL: https://codereview.chromium.org/1130303004

Cr-Commit-Position: refs/heads/master@{#329697}

11 files changed, 15 insertions, 13 deletions

diff --git a/cc/debug/frame_viewer_instrumentation.cc b/cc/debug/frame_viewer_instrumentation.cc
index 226cc88..e128583 100644
--- a/cc/debug/frame_viewer_instrumentation.cc
+++ b/cc/debug/frame_viewer_instrumentation.cc
@@ -4,6 +4,8 @@
 
 #include "cc/debug/frame_viewer_instrumentation.h"
 
+#include "cc/debug/traced_value.h"
+
 namespace cc {
 namespace frame_viewer_instrumentation {
 
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 0248cf9..f928849 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -628,8 +628,8 @@ ScopedTilePtr PictureLayerImpl::CreateTile(float contents_scale,
     flags = Tile::USE_PICTURE_ANALYSIS;
 
   return layer_tree_impl()->tile_manager()->CreateTile(
-      raster_source_.get(), content_rect.size(), content_rect, contents_scale,
-      id(), layer_tree_impl()->source_frame_number(), flags);
+      content_rect.size(), content_rect, contents_scale, id(),
+      layer_tree_impl()->source_frame_number(), flags);
 }
 
 const Region* PictureLayerImpl::GetPendingInvalidation() {
diff --git a/cc/resources/gpu_rasterizer.h b/cc/resources/gpu_rasterizer.h
index 69a200f..0a24e57 100644
--- a/cc/resources/gpu_rasterizer.h
+++ b/cc/resources/gpu_rasterizer.h
@@ -16,6 +16,7 @@ namespace cc {
 
 class ContextProvider;
 class ResourceProvider;
+class RasterSource;
 
 class CC_EXPORT GpuRasterizer {
  public:
diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
index e21a3aa..6e958f2 100644
--- a/cc/resources/picture_layer_tiling.cc
+++ b/cc/resources/picture_layer_tiling.cc
@@ -14,6 +14,7 @@
 #include "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
 #include "cc/resources/prioritized_tile.h"
+#include "cc/resources/raster_source.h"
 #include "cc/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "ui/gfx/geometry/point_conversions.h"
diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
index 440c9f1..4a2977e 100644
--- a/cc/resources/picture_layer_tiling_set.cc
+++ b/cc/resources/picture_layer_tiling_set.cc
@@ -8,6 +8,8 @@
 #include <set>
 #include <vector>
 
+#include "cc/resources/raster_source.h"
+
 namespace cc {
 
 namespace {
diff --git a/cc/resources/prioritized_tile.cc b/cc/resources/prioritized_tile.cc
index 7052507..c278b28 100644
--- a/cc/resources/prioritized_tile.cc
+++ b/cc/resources/prioritized_tile.cc
@@ -4,6 +4,7 @@
 
 #include "cc/resources/prioritized_tile.h"
 
+#include "cc/debug/traced_value.h"
 #include "cc/resources/picture_layer_tiling.h"
 
 namespace cc {
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index 58a92c7..ec80dbb 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -16,7 +16,6 @@ namespace cc {
 Tile::Id Tile::s_next_id_ = 0;
 
 Tile::Tile(TileManager* tile_manager,
-           RasterSource* raster_source,
            const gfx::Size& desired_texture_size,
            const gfx::Rect& content_rect,
            float contents_scale,
diff --git a/cc/resources/tile.h b/cc/resources/tile.h
index 25e9265..4935cbc 100644
--- a/cc/resources/tile.h
+++ b/cc/resources/tile.h
@@ -6,7 +6,6 @@
 #define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
-#include "cc/resources/raster_source.h"
 #include "cc/resources/tile_draw_info.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
@@ -85,7 +84,6 @@ class CC_EXPORT Tile {
 
   // Methods called by by tile manager.
   Tile(TileManager* tile_manager,
-       RasterSource* raster_source,
        const gfx::Size& desired_texture_size,
        const gfx::Rect& content_rect,
        float contents_scale,
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index 442d7ad..e28d8ce 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -751,16 +751,15 @@ void TileManager::UpdateTileDrawInfo(
   client_->NotifyTileStateChanged(tile);
 }
 
-ScopedTilePtr TileManager::CreateTile(RasterSource* raster_source,
-                                      const gfx::Size& desired_texture_size,
+ScopedTilePtr TileManager::CreateTile(const gfx::Size& desired_texture_size,
                                       const gfx::Rect& content_rect,
                                       float contents_scale,
                                       int layer_id,
                                       int source_frame_number,
                                       int flags) {
-  ScopedTilePtr tile(new Tile(this, raster_source, desired_texture_size,
-                              content_rect, contents_scale, layer_id,
-                              source_frame_number, flags));
+  ScopedTilePtr tile(new Tile(this, desired_texture_size, content_rect,
+                              contents_scale, layer_id, source_frame_number,
+                              flags));
   DCHECK(tiles_.find(tile->id()) == tiles_.end());
 
   tiles_[tile->id()] = tile.get();
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 1866026..d5bc763 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -116,8 +116,7 @@ class CC_EXPORT TileManager : public TileTaskRunnerClient {
 
   void UpdateVisibleTiles(const GlobalStateThatImpactsTilePriority& state);
 
-  ScopedTilePtr CreateTile(RasterSource* raster_source,
-                           const gfx::Size& desired_texture_size,
+  ScopedTilePtr CreateTile(const gfx::Size& desired_texture_size,
                            const gfx::Rect& content_rect,
                            float contents_scale,
                            int layer_id,
diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc
index ae6d593..75eff0c 100644
--- a/cc/test/fake_picture_layer_tiling_client.cc
+++ b/cc/test/fake_picture_layer_tiling_client.cc
@@ -35,7 +35,7 @@ FakePictureLayerTilingClient::~FakePictureLayerTilingClient() {
 
 ScopedTilePtr FakePictureLayerTilingClient::CreateTile(float content_scale,
                                                        const gfx::Rect& rect) {
-  return tile_manager_->CreateTile(pile_.get(), tile_size_, rect, 1, 0, 0, 0);
+  return tile_manager_->CreateTile(tile_size_, rect, 1, 0, 0, 0);
 }
 
 void FakePictureLayerTilingClient::SetTileSize(const gfx::Size& tile_size) {