Support general raster matrix for RasterSource and DisplayItemList

cc/playback/display_item_list.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_ITEM_LIST_H_
 #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 41 matching lines @@
   static scoped_refptr<DisplayItemList> CreateFromProto(
       const proto::DisplayItemList& proto,
       ImageSerializationProcessor* image_serialization_processor);
 
   // Creates a Protobuf representing the state of this DisplayItemList.
   // TODO(dtrainor): Don't resend DisplayItems that were already serialized
   // (crbug.com/548434).
   void ToProtobuf(proto::DisplayItemList* proto,
                   ImageSerializationProcessor* image_serialization_processor);
 
+  // TODO(trchen): Deprecated. Apply clip and scale on the canvas instead.
   void Raster(SkCanvas* canvas,
               SkPicture::AbortCallback* callback,
               const gfx::Rect& canvas_target_playback_rect,
               float contents_scale) const;
 
+  void Raster(SkCanvas* canvas, SkPicture::AbortCallback* callback) const;
+
   // This is a fast path for use only if canvas_ is set and
   // retain_individual_display_items_ is false. This method also updates
   // approximate_op_count_.
   void RasterIntoCanvas(const DisplayItem& display_item);
 
   // Because processing happens in this function, all the set up for
   // this item should be done via the args, which is why the return
   // type needs to be const, to prevent set-after-processing mistakes.
   template <typename DisplayItemType, typename... Args>
   const DisplayItemType& CreateAndAppendItem(const gfx::Rect& visual_rect,
@@ skipping 63 matching lines @@
   DiscardableImageMap image_map_;
 
   friend class base::RefCountedThreadSafe<DisplayItemList>;
   FRIEND_TEST_ALL_PREFIXES(DisplayItemListTest, ApproximateMemoryUsage);
   DISALLOW_COPY_AND_ASSIGN(DisplayItemList);
 };
 
 }  // namespace cc
 
 #endif  // CC_PLAYBACK_DISPLAY_ITEM_LIST_H_