Support general raster matrix for RasterSource and DisplayItemList

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 <memory>
@@ skipping 25 matching lines @@
 
     // 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.
+  // TODO(trchen): Deprecated.
+  void PlaybackToCanvas(SkCanvas* canvas,
+                        const gfx::Rect& canvas_bitmap_rect,
+                        const gfx::Rect& canvas_playback_rect,
+                        float contents_scale,
+                        const PlaybackSettings& settings) const;
+
+  // Raster this RasterSource into the given canvas. Canvas states such as
+  // CTM and clip region will be respected. This function will replace pixels
+  // in the clip region without blending. It is assumed that existing pixels
+  // may be uninitialized and will be cleared before playback.
   //
   // 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 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 67 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:
-  void RasterCommon(SkCanvas* canvas,
-                    SkPicture::AbortCallback* callback,
-                    const gfx::Rect& canvas_bitmap_rect,
-                    const gfx::Rect& canvas_playback_rect,
-                    float contents_scale) const;
+  void RasterCommon(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
 
-  void PrepareForPlaybackToCanvas(SkCanvas* canvas,
-                                  const gfx::Rect& canvas_bitmap_rect,
-                                  const gfx::Rect& canvas_playback_rect,
-                                  float contents_scale) const;
+  void PrepareForPlaybackToCanvas(SkCanvas* canvas) const;
 
   DISALLOW_COPY_AND_ASSIGN(RasterSource);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_RASTER_SOURCE_H_