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

cc/resources/raster_worker_pool.cc

 // Copyright 2013 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/raster_worker_pool.h"
 
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "cc/debug/devtools_instrumentation.h"
@@ skipping 19 matching lines @@
 };
 
 class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
  public:
   RasterWorkerPoolTaskImpl(const Resource* resource,
                            PicturePileImpl* picture_pile,
                            gfx::Rect content_rect,
                            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)
       : internal::RasterWorkerPoolTask(resource, dependencies),
         picture_pile_(picture_pile),
         content_rect_(content_rect),
         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_);
 
     PicturePileImpl* picture_clone =
         picture_pile_->GetCloneForDrawingOnThread(thread_index);
 
     DCHECK(picture_clone);
 
     base::TimeTicks start_time = rendering_stats_->StartRecording();
     picture_clone->AnalyzeInRect(content_rect_, contents_scale_, &analysis_);
     base::TimeDelta duration = rendering_stats_->EndRecording(start_time);
 
     // Record the solid color prediction.
     UMA_HISTOGRAM_BOOLEAN("Renderer4.SolidColorTilesAnalyzed",
                           analysis_.is_solid_color);
     rendering_stats_->AddTileAnalysisResult(duration,
                                             analysis_.is_solid_color);
 
     // Clear the flag if we're not using the estimator.
     analysis_.is_solid_color &= use_color_estimator_;
   }
 
   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);
 
     if (analysis_.is_solid_color)
       return false;
 
     PicturePileImpl* picture_clone =
         picture_pile_->GetCloneForDrawingOnThread(thread_index);
 
@@ skipping 17 matching lines @@
     canvas.setDrawFilter(draw_filter.get());
 
     if (rendering_stats_->record_rendering_stats()) {
       PicturePileImpl::RasterStats raster_stats;
       picture_clone->RasterToBitmap(
           &canvas, content_rect_, contents_scale_, &raster_stats);
       rendering_stats_->AddRaster(
           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",
           raster_stats.total_rasterize_time.InMicroseconds(),
           0,
           100000,
           100);
     } else {
       picture_clone->RasterToBitmap(
           &canvas, content_rect_, contents_scale_, NULL);
     }
     return true;
   }
 
   // Overridden from internal::RasterWorkerPoolTask:
   virtual bool RunOnThread(SkDevice* device, unsigned thread_index) OVERRIDE {
     RunAnalysisOnThread(thread_index);
     return RunRasterOnThread(device, thread_index);
   }
   virtual void DispatchCompletionCallback() OVERRIDE {
     reply_.Run(analysis_, !HasFinishedRunning() || WasCanceled());
   }
 
  protected:
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterWorkerPoolTaskImpl);
 };
 
 class ImageDecodeWorkerPoolTaskImpl : public internal::WorkerPoolTask {
  public:
   ImageDecodeWorkerPoolTaskImpl(skia::LazyPixelRef* pixel_ref,
                                 int layer_id,
@@ skipping 100 matching lines @@
   DCHECK(!did_complete_);
   did_complete_ = true;
 }
 
 bool RasterWorkerPoolTask::HasCompleted() const {
   return did_complete_;
 }
 
 }  // 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() {
 }
 
 RasterWorkerPool::Task::Set::~Set() {
 }
 
 void RasterWorkerPool::Task::Set::Insert(const Task& task) {
   DCHECK(!task.is_null());
   tasks_.push_back(task.internal_);
 }
@@ skipping 42 matching lines @@
 }
 
 // static
 RasterWorkerPool::RasterTask RasterWorkerPool::CreateRasterTask(
     const Resource* resource,
     PicturePileImpl* picture_pile,
     gfx::Rect content_rect,
     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
 RasterWorkerPool::Task RasterWorkerPool::CreateImageDecodeTask(
     skia::LazyPixelRef* pixel_ref,
     int layer_id,
     RenderingStatsInstrumentation* stats_instrumentation,
     const Task::Reply& reply) {
   return Task(new ImageDecodeWorkerPoolTaskImpl(pixel_ref,
                                                 layer_id,
@@ skipping 127 matching lines @@
 
     internal::GraphNode* decode_node = CreateGraphNodeForTask(
         decode_task, priority, graph);
     decode_node->add_dependent(raster_node);
   }
 
   return raster_node;
 }
 
 }  // namespace cc