| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index 6a068a134bd94b68e9c727ab703c4ea5c2a0cded..96e4b7ff8940063ba5ad9fe6924eeeb81367b491 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -11,7 +11,6 @@
|
| #include "base/json/json_writer.h"
|
| #include "base/logging.h"
|
| #include "base/metrics/histogram.h"
|
| -#include "cc/debug/debug_colors.h"
|
| #include "cc/debug/devtools_instrumentation.h"
|
| #include "cc/debug/traced_value.h"
|
| #include "cc/resources/raster_worker_pool.h"
|
| @@ -860,7 +859,7 @@ void TileManager::RunAnalyzeTask(
|
| SkDevice device(
|
| SkBitmap::kARGB_8888_Config, layer_rect.width(), layer_rect.height());
|
| SkCanvas canvas(&device);
|
| - picture_pile->Raster(&canvas, layer_rect, 1.0f, NULL);
|
| + picture_pile->RasterToBitmap(&canvas, layer_rect, 1.0f, NULL);
|
|
|
| const SkBitmap bitmap = device.accessBitmap(false);
|
| DCHECK_EQ(bitmap.rowBytes(),
|
| @@ -913,14 +912,9 @@ void TileManager::RunRasterTask(
|
| SkDevice device(bitmap);
|
| SkCanvas canvas(&device);
|
|
|
| -#ifndef NDEBUG
|
| - // Any non-painted areas will be left in this color.
|
| - canvas.clear(DebugColors::NonPaintedFillColor());
|
| -#endif // NDEBUG
|
| -
|
| if (stats_instrumentation->record_rendering_stats()) {
|
| PicturePileImpl::RasterStats raster_stats;
|
| - picture_pile->Raster(&canvas, rect, contents_scale, &raster_stats);
|
| + picture_pile->RasterToBitmap(&canvas, rect, contents_scale, &raster_stats);
|
| stats_instrumentation->AddRaster(
|
| raster_stats.total_rasterize_time,
|
| raster_stats.best_rasterize_time,
|
| @@ -934,7 +928,7 @@ void TileManager::RunRasterTask(
|
| 100000,
|
| 100);
|
| } else {
|
| - picture_pile->Raster(&canvas, rect, contents_scale, NULL);
|
| + picture_pile->RasterToBitmap(&canvas, rect, contents_scale, NULL);
|
| }
|
| }
|
|
|
|
|