Add flag for drawing layers to screen with Ganesh

cc/resources/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/resources/tile_manager.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #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"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/tile.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/gfx/rect_conversions.h"
 
 namespace cc {
 
@@ skipping 828 matching lines @@
   // Clear the flag if we're not using the estimator.
   analysis->is_solid_color &= use_color_estimator;
 
   if (metadata.prediction_benchmarking) {
     gfx::Rect layer_rect = gfx::ToEnclosingRect(
         gfx::ScaleRect(rect, 1.0f / contents_scale));
 
     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(),
               static_cast<size_t>(bitmap.width() * bitmap.bytesPerPixel()));
 
     RecordSolidColorPredictorResults(
         reinterpret_cast<SkPMColor*>(bitmap.getPixels()),
         bitmap.getSize() / bitmap.bytesPerPixel(),
         analysis->is_solid_color,
         SkPreMultiplyColor(analysis->solid_color));
@@ skipping 32 matching lines @@
 
   if (analysis->is_solid_color)
     return;
 
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, rect.width(), rect.height());
   bitmap.setPixels(buffer);
   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,
         raster_stats.total_pixels_rasterized,
         metadata.is_tile_in_pending_tree_now_bin);
 
     HISTOGRAM_CUSTOM_COUNTS(
         "Renderer4.PictureRasterTimeUS",
         raster_stats.total_rasterize_time.InMicroseconds(),
         0,
         100000,
         100);
   } else {
-    picture_pile->Raster(&canvas, rect, contents_scale, NULL);
+    picture_pile->RasterToBitmap(&canvas, rect, contents_scale, NULL);
   }
 }
 
 // static
 void TileManager::RunImageDecodeTask(
     skia::LazyPixelRef* pixel_ref,
     RenderingStatsInstrumentation* stats_instrumentation) {
   TRACE_EVENT0("cc", "TileManager::RunImageDecodeTask");
   base::TimeTicks start_time = stats_instrumentation->StartRecording();
   pixel_ref->Decode();
@@ skipping 29 matching lines @@
                     is_predicted_solid && predicted_color != actual_color);
   HISTOGRAM_BOOLEAN("Renderer4.ColorPredictor.Accuracy",
                     is_predicted_solid == is_actually_solid &&
                     (!is_predicted_solid || predicted_color == actual_color));
   HISTOGRAM_BOOLEAN("Renderer4.ColorPredictor.IsCorrectSolid",
                     is_predicted_solid == is_actually_solid &&
                     (is_predicted_solid && predicted_color == actual_color));
 }
 
 }  // namespace cc