| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index 3eb7bc29714c803b2ab51bb2870dd587f6325ea7..65068551bfdc4f71b0d3ada6bd37fa65a11cd6b3 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -678,19 +678,6 @@ RasterWorkerPool::Task TileManager::CreateImageDecodeTask(
|
| base::Unretained(pixel_ref)));
|
| }
|
|
|
| -RasterTaskMetadata TileManager::GetRasterTaskMetadata(
|
| - const Tile& tile) const {
|
| - RasterTaskMetadata metadata;
|
| - const ManagedTileState& mts = tile.managed_state();
|
| - metadata.is_tile_in_pending_tree_now_bin =
|
| - mts.tree_bin[PENDING_TREE] == NOW_BIN;
|
| - metadata.tile_resolution = mts.resolution;
|
| - metadata.layer_id = tile.layer_id();
|
| - metadata.tile_id = &tile;
|
| - metadata.source_frame_number = tile.source_frame_number();
|
| - return metadata;
|
| -}
|
| -
|
| RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
|
| TRACE_EVENT0("cc", "TileManager::CreateRasterTask");
|
|
|
| @@ -725,14 +712,17 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
|
| existing_pixel_refs[id] = decode_task;
|
| }
|
|
|
| - RasterTaskMetadata metadata = GetRasterTaskMetadata(*tile);
|
| return RasterWorkerPool::CreateRasterTask(
|
| const_resource,
|
| tile->picture_pile(),
|
| tile->content_rect(),
|
| tile->contents_scale(),
|
| mts.raster_mode,
|
| - metadata,
|
| + mts.tree_bin[PENDING_TREE] == NOW_BIN,
|
| + mts.resolution,
|
| + tile->layer_id(),
|
| + &tile,
|
| + tile->source_frame_number(),
|
| rendering_stats_instrumentation_,
|
| base::Bind(&TileManager::OnRasterTaskCompleted,
|
| base::Unretained(this),
|
|
|