cc: Refactor SkipImageCanvas and create it during playback.

cc/playback/display_list_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_DISPLAY_LIST_RASTER_SOURCE_H_
 #define CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_
 
 #include <stddef.h>
 
 #include <vector>
@@ skipping 30 matching lines @@
   // 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) const;
+                                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) const;
+                              float contents_scale,
+                              bool include_images) 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 98 matching lines @@
 
   // Used to ensure that memory dump logic always happens on the same thread.
   base::ThreadChecker memory_dump_thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayListRasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_LIST_RASTER_SOURCE_H_