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 876 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,
     int layer_id,
     RenderingStatsInstrumentation* stats_instrumentation) {
   TRACE_EVENT0("cc", "TileManager::RunImageDecodeTask");
   devtools_instrumentation::ScopedImageDecodeTask image_decode_task(layer_id);
   base::TimeTicks start_time = stats_instrumentation->StartRecording();
   pixel_ref->Decode();
   base::TimeDelta duration = stats_instrumentation->EndRecording(start_time);
   stats_instrumentation->AddDeferredImageDecode(duration);
 }
 
 }  // namespace cc