Clean up calls to ToSkPicture

cc/paint/skia_paint_canvas.h

 // 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.
 
 #ifndef CC_PAINT_SKIA_PAINT_CANVAS_H_
 #define CC_PAINT_SKIA_PAINT_CANVAS_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
@@ skipping 115 matching lines @@
                    const SkPoint pos[],
                    const PaintFlags& flags) override;
   void drawTextBlob(sk_sp<SkTextBlob> blob,
                     SkScalar x,
                     SkScalar y,
                     const PaintFlags& flags) override;
 
   void drawDisplayItemList(const SkRect& bounds,
                            const DisplayItemList*) override;
 
-  void drawPicture(sk_sp<const PaintRecord> record,
-                   const SkMatrix* matrix,
-                   const PaintFlags* flags) override;
+  void drawPicture(sk_sp<const PaintRecord> record) override;
 
   bool isClipEmpty() const override;
   bool isClipRect() const override;
   const SkMatrix& getTotalMatrix() const override;
 
   void temporary_internal_describeTopLayer(SkMatrix* matrix,
                                            SkIRect* clip_bounds) override;
 
   bool ToPixmap(SkPixmap* output) override;
   void AnnotateRectWithURL(const SkRect& rect, SkData* data) override;
@@ skipping 10 matching lines @@
   using PaintCanvas::drawPicture;
 
  private:
   SkCanvas* canvas_;
   std::unique_ptr<SkCanvas> owned_;
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_SKIA_PAINT_CANVAS_H_