Clean up calls to ToSkPicture

cc/paint/skia_paint_canvas.cc

 // Copyright 2017 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/paint/paint_canvas.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_record.h"
 #include "cc/paint/paint_recorder.h"
@@ skipping 250 matching lines @@
                                    SkScalar y,
                                    const PaintFlags& flags) {
   canvas_->drawTextBlob(blob.get(), x, y, ToSkPaint(flags));
 }
 
 void SkiaPaintCanvas::drawDisplayItemList(
     scoped_refptr<DisplayItemList> display_item_list) {
   display_item_list->Raster(canvas_, nullptr);
 }
 
-void SkiaPaintCanvas::drawPicture(sk_sp<const PaintRecord> record,
-                                  const SkMatrix* matrix,
-                                  const PaintFlags* flags) {
-  canvas_->drawPicture(ToSkPicture(record.get()), matrix, ToSkPaint(flags));
+void SkiaPaintCanvas::drawPicture(sk_sp<const PaintRecord> record) {
+  record->playback(canvas_);
 }
 
 bool SkiaPaintCanvas::isClipEmpty() const {
   return canvas_->isClipEmpty();
 }
 
 bool SkiaPaintCanvas::isClipRect() const {
   return canvas_->isClipRect();
 }
 
@@ skipping 32 matching lines @@
                                                SkData* data) {
   SkAnnotateNamedDestination(canvas_, point, data);
 }
 
 void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect,
                                                 SkData* data) {
   SkAnnotateLinkToDestination(canvas_, rect, data);
 }
 
 }  // namespace cc