Merge 210098 "cc: Eliminate tile.h's dependency on tile_manager.h"

cc/resources/raster_worker_pool.cc

Index: cc/resources/raster_worker_pool.cc
===================================================================
--- cc/resources/raster_worker_pool.cc	(revision 211724)
+++ cc/resources/raster_worker_pool.cc	(working copy)
@@ -37,7 +37,11 @@
                            float contents_scale,
                            RasterMode raster_mode,
                            bool use_color_estimator,
-                           const RasterTaskMetadata& metadata,
+                           bool is_tile_in_pending_tree_now_bin,
+                           TileResolution tile_resolution,
+                           int layer_id,
+                           const void* tile_id,
+                           int source_frame_number,
                            RenderingStatsInstrumentation* rendering_stats,
                            const RasterWorkerPool::RasterTask::Reply& reply,
                            TaskVector* dependencies)
@@ -47,15 +51,19 @@
         contents_scale_(contents_scale),
         raster_mode_(raster_mode),
         use_color_estimator_(use_color_estimator),
-        metadata_(metadata),
+        is_tile_in_pending_tree_now_bin_(is_tile_in_pending_tree_now_bin),
+        tile_resolution_(tile_resolution),
+        layer_id_(layer_id),
+        tile_id_(tile_id),
+        source_frame_number_(source_frame_number),
         rendering_stats_(rendering_stats),
         reply_(reply) {}
 
   void RunAnalysisOnThread(unsigned thread_index) {
     TRACE_EVENT1("cc",
                  "RasterWorkerPoolTaskImpl::RunAnalysisOnThread",
-                 "metadata",
-                 TracedValue::FromValue(metadata_.AsValue().release()));
+                 "data",
+                 TracedValue::FromValue(DataAsValue().release()));
 
     DCHECK(picture_pile_.get());
     DCHECK(rendering_stats_);
@@ -80,11 +88,16 @@
   }
 
   bool RunRasterOnThread(SkDevice* device, unsigned thread_index) {
-    TRACE_EVENT1(
-        "cc", "RasterWorkerPoolTaskImpl::RunRasterOnThread",
-        "metadata", TracedValue::FromValue(metadata_.AsValue().release()));
+    TRACE_EVENT2(
+        "cc",
+        "RasterWorkerPoolTaskImpl::RunRasterOnThread",
+        "data",
+        TracedValue::FromValue(DataAsValue().release()),
+        "raster_mode",
+        TracedValue::FromValue(RasterModeAsValue(raster_mode_).release()));
+
     devtools_instrumentation::ScopedLayerTask raster_task(
-        devtools_instrumentation::kRasterTask, metadata_.layer_id);
+        devtools_instrumentation::kRasterTask, layer_id_);
 
     DCHECK(picture_pile_.get());
     DCHECK(device);
@@ -122,7 +135,7 @@
           raster_stats.total_rasterize_time,
           raster_stats.best_rasterize_time,
           raster_stats.total_pixels_rasterized,
-          metadata_.is_tile_in_pending_tree_now_bin);
+          is_tile_in_pending_tree_now_bin_);
 
       HISTOGRAM_CUSTOM_COUNTS(
           "Renderer4.PictureRasterTimeUS",
@@ -150,13 +163,28 @@
   virtual ~RasterWorkerPoolTaskImpl() {}
 
  private:
+  scoped_ptr<base::Value> DataAsValue() const {
+    scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue());
+    res->Set("tile_id", TracedValue::CreateIDRef(tile_id_).release());
+    res->SetBoolean("is_tile_in_pending_tree_now_bin",
+                    is_tile_in_pending_tree_now_bin_);
+    res->Set("resolution", TileResolutionAsValue(tile_resolution_).release());
+    res->SetInteger("source_frame_number", source_frame_number_);
+    res->SetInteger("layer_id", layer_id_);
+    return res.PassAs<base::Value>();
+  }
+
   PicturePileImpl::Analysis analysis_;
   scoped_refptr<PicturePileImpl> picture_pile_;
   gfx::Rect content_rect_;
   float contents_scale_;
   RasterMode raster_mode_;
   bool use_color_estimator_;
-  RasterTaskMetadata metadata_;
+  bool is_tile_in_pending_tree_now_bin_;
+  TileResolution tile_resolution_;
+  int layer_id_;
+  const void* tile_id_;
+  int source_frame_number_;
   RenderingStatsInstrumentation* rendering_stats_;
   const RasterWorkerPool::RasterTask::Reply reply_;
 
@@ -277,16 +305,6 @@
 
 }  // namespace internal
 
-scoped_ptr<base::Value> RasterTaskMetadata::AsValue() const {
-  scoped_ptr<base::DictionaryValue> res(new base::DictionaryValue());
-  res->Set("tile_id", TracedValue::CreateIDRef(tile_id).release());
-  res->SetBoolean("is_tile_in_pending_tree_now_bin",
-                  is_tile_in_pending_tree_now_bin);
-  res->Set("resolution", TileResolutionAsValue(tile_resolution).release());
-  res->SetInteger("source_frame_number", source_frame_number);
-  return res.PassAs<base::Value>();
-}
-
 RasterWorkerPool::Task::Set::Set() {
 }
 
@@ -349,20 +367,29 @@
     float contents_scale,
     RasterMode raster_mode,
     bool use_color_estimator,
-    const RasterTaskMetadata& metadata,
+    bool is_tile_in_pending_tree_now_bin,
+    TileResolution tile_resolution,
+    int layer_id,
+    const void* tile_id,
+    int source_frame_number,
     RenderingStatsInstrumentation* rendering_stats,
     const RasterTask::Reply& reply,
     Task::Set* dependencies) {
-  return RasterTask(new RasterWorkerPoolTaskImpl(resource,
-                                                 picture_pile,
-                                                 content_rect,
-                                                 contents_scale,
-                                                 raster_mode,
+  return RasterTask(
+      new RasterWorkerPoolTaskImpl(resource,
+                                   picture_pile,
+                                   content_rect,
+                                   contents_scale,
+                                   raster_mode,
                                                  use_color_estimator,
-                                                 metadata,
-                                                 rendering_stats,
-                                                 reply,
-                                                 &dependencies->tasks_));
+                                   is_tile_in_pending_tree_now_bin,
+                                   tile_resolution,
+                                   layer_id,
+                                   tile_id,
+                                   source_frame_number,
+                                   rendering_stats,
+                                   reply,
+                                   &dependencies->tasks_));
 }
 
 // static