[cc] Pass metadata about a tile to the raster system for benchmarks

cc/tile_manager.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/tile_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 741 matching lines @@
       resource_pool_->AcquireResource(tile->tile_size_.size(), tile->format_);
   resource_pool_->resource_provider()->acquirePixelBuffer(resource->id());
 
   managed_tile_state.resource_is_being_initialized = true;
   managed_tile_state.can_be_freed = false;
 
   DidTileRasterStateChange(tile, RASTER_STATE);
   return resource.Pass();
 }
 
+namespace {

[reveman, 2013/02/13 10:24:39]

we already have an anonymous namespace section at the top, could you put this
there instead?

+
+RasterTaskMetadata GetRasterTaskMetadata(const ManagedTileState& mts) {
+  RasterTaskMetadata raster_task_metadata;
+  raster_task_metadata.is_tile_in_pending_tree_now_bin =
+      mts.tree_bin[PENDING_TREE] == NOW_BIN;
+  raster_task_metadata.tile_resolution = mts.resolution;
+  return raster_task_metadata;
+}
+
+} // namespace
+
 void TileManager::DispatchOneRasterTask(scoped_refptr<Tile> tile) {
   TRACE_EVENT0("cc", "TileManager::DispatchOneRasterTask");
   scoped_ptr<ResourcePool::Resource> resource = PrepareTileForRaster(tile);
   ResourceProvider::ResourceId resource_id = resource->id();
 
   raster_worker_pool_->PostRasterTaskAndReply(
       tile->picture_pile(),
       base::Bind(&TileManager::PerformRaster,
                  resource_pool_->resource_provider()->mapPixelBuffer(
                      resource_id),
                  tile->content_rect_,
                  tile->contents_scale(),
-                 use_cheapness_estimator_),
+                 use_cheapness_estimator_,
+                 GetRasterTaskMetadata(tile->managed_state())),
       base::Bind(&TileManager::OnRasterTaskCompleted,
                  base::Unretained(this),
                  tile,
                  base::Passed(&resource),
                  manage_tiles_call_count_));
 }
 
 void TileManager::PerformOneRaster(Tile* tile) {
   scoped_ptr<ResourcePool::Resource> resource = PrepareTileForRaster(tile);
   ResourceProvider::ResourceId resource_id = resource->id();
 
   PerformRaster(resource_pool_->resource_provider()->mapPixelBuffer(
                     resource_id),
                 tile->content_rect_,
                 tile->contents_scale(),
                 use_cheapness_estimator_,
+                GetRasterTaskMetadata(tile->managed_state()),
                 tile->picture_pile(),
                 &rendering_stats_);
 
   OnRasterCompleted(tile, resource.Pass(), manage_tiles_call_count_);
 }
 
 void TileManager::OnRasterCompleted(
     scoped_refptr<Tile> tile,
     scoped_ptr<ResourcePool::Resource> resource,
     int manage_tiles_call_count_when_dispatched) {
@@ skipping 85 matching lines @@
   ++raster_state_count_[mts.raster_state][tree][new_tree_bin];
 
   mts.tree_bin[tree] = new_tree_bin;
 }
 
 // static
 void TileManager::PerformRaster(uint8* buffer,
                                 const gfx::Rect& rect,
                                 float contents_scale,
                                 bool use_cheapness_estimator,
+                                const RasterTaskMetadata& raster_task_metadata,
                                 PicturePileImpl* picture_pile,
                                 RenderingStats* stats) {
-  TRACE_EVENT0("cc", "TileManager::PerformRaster");
+  TRACE_EVENT2("cc", "TileManager::PerformRaster",
+               "is_on_pending_tree", raster_task_metadata.is_tile_in_pending_tree_now_bin,
+               "is_low_res", raster_task_metadata.tile_resolution == LOW_RESOLUTION);

[reveman, 2013/02/13 10:24:39]

nit: break these lines so they are not too long.

   DCHECK(picture_pile);
   DCHECK(buffer);
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, rect.width(), rect.height());
   bitmap.setPixels(buffer);
   SkDevice device(bitmap);
   SkCanvas canvas(&device);
 
   base::TimeTicks begin_time;
   if (stats)
@@ skipping 44 matching lines @@
     decode_begin_time = base::TimeTicks::Now();
   pixel_ref->Decode();
   if (stats) {
     stats->totalDeferredImageDecodeCount++;
     stats->totalDeferredImageDecodeTime +=
         base::TimeTicks::Now() - decode_begin_time;
   }
 }
 
 }  // namespace cc