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 257 matching lines @@
 
 void SkiaPaintCanvas::drawDisplayItemList(
     const SkRect& bounds,
     const DisplayItemList* display_item_list) {
   SkPictureRecorder recorder;
   SkCanvas* canvas = recorder.beginRecording(bounds);
   display_item_list->Raster(canvas, nullptr);
   canvas_->drawPicture(recorder.finishRecordingAsPicture());
 }
 
-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 28 matching lines @@
                                                SkData* data) {
   SkAnnotateNamedDestination(canvas_, point, data);
 }
 
 void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect,
                                                 SkData* data) {
   SkAnnotateLinkToDestination(canvas_, rect, data);
 }
 
 }  // namespace cc