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

cc/playback/raster_source.h

 // Copyright 2014 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.
 
 #ifndef CC_PLAYBACK_RASTER_SOURCE_H_
 #define CC_PLAYBACK_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 10 matching lines @@
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace cc {
 class DisplayItemList;
 class DrawImage;
 class ImageDecodeController;
 
 class CC_EXPORT RasterSource : public base::trace_event::MemoryDumpProvider,
                                public base::RefCountedThreadSafe<RasterSource> {
  public:
+  struct CC_EXPORT PlaybackSettings {
+    PlaybackSettings();
+
+    // If set to true, this indicates that the canvas has already been
+    // rasterized into. This means that the canvas cannot be cleared safely.
+    bool playback_to_shared_canvas;
+
+    // If set to true, none of the images will be rasterized.
+    bool skip_images;
+
+    // If set to true, we will use an image hijack canvas, which enables
+    // compositor image caching.
+    bool use_image_hijack_canvas;
+  };
+
   static scoped_refptr<RasterSource> CreateFromRecordingSource(
       const RecordingSource* other,
       bool can_use_lcd_text);
 
   // Raster a subrect of this RasterSource into the given canvas. It is
   // assumed that contents_scale has already been applied to this canvas.
   // Writes the total number of pixels rasterized and the time spent
   // rasterizing to the stats if the respective pointer is not nullptr.
   // It is assumed that the canvas passed here will only be rasterized by
   // this raster source via this call.
   //
   // Virtual for testing.
   //
   // Note that this should only be called after the image decode controller has
   // been set, which happens during commit.
   virtual void PlaybackToCanvas(SkCanvas* canvas,
                                 const gfx::Rect& canvas_bitmap_rect,
                                 const gfx::Rect& canvas_playback_rect,
                                 float contents_scale,
-                                bool include_images) const;
-
-  // Similar to above, except that the canvas passed here can (or was already)
-  // rasterized into by another raster source. That is, it is not safe to clear
-  // the canvas or discard its underlying memory.
-  void PlaybackToSharedCanvas(SkCanvas* canvas,
-                              const gfx::Rect& canvas_rect,
-                              float contents_scale,
-                              bool include_images) const;
+                                const PlaybackSettings& settings) const;
 
   // Returns whether the given rect at given scale is of solid color in
   // this raster source, as well as the solid color value.
   bool PerformSolidColorAnalysis(const gfx::Rect& content_rect,
                                  float contents_scale,
                                  SkColor* color) const;
 
   // Returns true iff the whole raster source is of solid color.
   bool IsSolidColor() const;
 
@@ skipping 70 matching lines @@
   const int slow_down_raster_scale_factor_for_debug_;
   // TODO(enne/vmiura): this has a read/write race between raster and compositor
   // threads with multi-threaded Ganesh.  Make this const or remove it.
   bool should_attempt_to_use_distance_field_text_;
 
   // In practice, this is only set once before raster begins, so it's ok with
   // respect to threading.
   ImageDecodeController* image_decode_controller_;
 
  private:
-  // Called when analyzing a tile. We can use AnalysisCanvas as
-  // SkPicture::AbortCallback, which allows us to early out from analysis.
-  void RasterForAnalysis(skia::AnalysisCanvas* canvas,
-                         const gfx::Rect& canvas_rect,
-                         float contents_scale) const;
-
   void RasterCommon(SkCanvas* canvas,
                     SkPicture::AbortCallback* callback,
                     const gfx::Rect& canvas_bitmap_rect,
                     const gfx::Rect& canvas_playback_rect,
                     float contents_scale) const;
 
   void PrepareForPlaybackToCanvas(SkCanvas* canvas,
                                   const gfx::Rect& canvas_bitmap_rect,
                                   const gfx::Rect& canvas_playback_rect,
                                   float contents_scale) const;
 
   // Used to ensure that memory dump logic always happens on the same thread.
   base::ThreadChecker memory_dump_thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_