Clean up calls to ToSkPicture

cc/paint/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_PAINT_CANVAS_H_
 #define CC_PAINT_PAINT_CANVAS_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 152 matching lines @@
                            const SkPoint pos[],
                            const PaintFlags& flags) = 0;
   virtual void drawTextBlob(sk_sp<SkTextBlob> blob,
                             SkScalar x,
                             SkScalar y,
                             const PaintFlags& flags) = 0;
 
   virtual void drawDisplayItemList(
       scoped_refptr<DisplayItemList> display_item_list) = 0;
 
-  virtual void drawPicture(sk_sp<const PaintRecord> record,
-                           const SkMatrix* matrix,
-                           const PaintFlags* flags) = 0;
-  void drawPicture(sk_sp<const PaintRecord> record) {
-    drawPicture(record, nullptr, nullptr);
-  }
+  virtual void drawPicture(sk_sp<const PaintRecord> record) = 0;
 
   virtual bool isClipEmpty() const = 0;
   virtual bool isClipRect() const = 0;
   virtual const SkMatrix& getTotalMatrix() const = 0;
 
   // For GraphicsContextCanvas only.  Maybe this could be rewritten?
   virtual void temporary_internal_describeTopLayer(SkMatrix* matrix,
                                                    SkIRect* clip_bounds) = 0;
 
   virtual bool ToPixmap(SkPixmap* output) = 0;
@@ skipping 75 matching lines @@
                                                          const SkPoint& point,
                                                          SkData* data);
 
 CC_PAINT_EXPORT void PaintCanvasAnnotateLinkToDestination(PaintCanvas* canvas,
                                                           const SkRect& rect,
                                                           SkData* data);
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_CANVAS_H_