cc: Add RasterSource::PlaybackSettings for finer control of raster.

cc/raster/tile_task_worker_pool.cc

 // Copyright 2013 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/raster/tile_task_worker_pool.h"
 
 #include <stddef.h>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/raster_source.h"
@@ skipping 42 matching lines @@
     case LUMINANCE_F16:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // anonymous namespace
 
 // static
-void TileTaskWorkerPool::PlaybackToMemory(void* memory,
-                                          ResourceFormat format,
-                                          const gfx::Size& size,
-                                          size_t stride,
-                                          const RasterSource* raster_source,
-                                          const gfx::Rect& canvas_bitmap_rect,
-                                          const gfx::Rect& canvas_playback_rect,
-                                          float scale,
-                                          bool include_images) {
+void TileTaskWorkerPool::PlaybackToMemory(
+    void* memory,
+    ResourceFormat format,
+    const gfx::Size& size,
+    size_t stride,
+    const RasterSource* raster_source,
+    const gfx::Rect& canvas_bitmap_rect,
+    const gfx::Rect& canvas_playback_rect,
+    float scale,
+    const RasterSource::PlaybackSettings& playback_settings) {
   TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory");
 
   DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format;
 
   // Uses kPremul_SkAlphaType since the result is not known to be opaque.
   SkImageInfo info =
       SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType);
 
   // Use unknown pixel geometry to disable LCD text.
   SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
   if (raster_source->CanUseLCDText()) {
     // LegacyFontHost will get LCD text and skia figures out what type to use.
     surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
   }
 
   if (!stride)
     stride = info.minRowBytes();
   DCHECK_GT(stride, 0u);
 
   switch (format) {
     case RGBA_8888:
     case BGRA_8888: {
       skia::RefPtr<SkSurface> surface = skia::AdoptRef(
           SkSurface::NewRasterDirect(info, memory, stride, &surface_props));
       raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
                                       canvas_playback_rect, scale,
-                                      include_images);
+                                      playback_settings);
       return;
     }
     case RGBA_4444:
     case ETC1: {
       skia::RefPtr<SkSurface> surface =
           skia::AdoptRef(SkSurface::NewRaster(info, &surface_props));
       // TODO(reveman): Improve partial raster support by reducing the size of
       // playback rect passed to PlaybackToCanvas. crbug.com/519070
       raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
                                       canvas_bitmap_rect, scale,
-                                      include_images);
+                                      playback_settings);
 
       if (format == ETC1) {
         TRACE_EVENT0("cc",
                      "TileTaskWorkerPool::PlaybackToMemory::CompressETC1");
         DCHECK_EQ(size.width() % 4, 0);
         DCHECK_EQ(size.height() % 4, 0);
         scoped_ptr<TextureCompressor> texture_compressor =
             TextureCompressor::Create(TextureCompressor::kFormatETC1);
         texture_compressor->Compress(reinterpret_cast<const uint8_t*>(
                                          surface->peekPixels(nullptr, nullptr)),
@@ skipping 18 matching lines @@
     case RED_8:
     case LUMINANCE_F16:
       NOTREACHED();
       return;
   }
 
   NOTREACHED();
 }
 
 }  // namespace cc