Back PaintRecord with PaintOpBuffer instead of SkPicture

cc/paint/skia_paint_canvas.h

Index: cc/paint/skia_paint_canvas.h
diff --git a/cc/paint/skia_paint_canvas.h b/cc/paint/skia_paint_canvas.h
index f751f7781664aed4a1e5b28d0dc419a34c44ed91..8d9b048a340adbb0197a5b739eac3a6792276d3a 100644
--- a/cc/paint/skia_paint_canvas.h
+++ b/cc/paint/skia_paint_canvas.h
@@ -53,7 +53,7 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas {
                    int y) override;
   int save() override;
   int saveLayer(const SkRect* bounds, const PaintFlags* flags) override;
-  int saveLayerAlpha(const SkRect* bounds, U8CPU alpha) override;
+  int saveLayerAlpha(const SkRect* bounds, uint8_t alpha) override;
 
   void restore() override;
   int getSaveCount() const override;
@@ -145,9 +145,9 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas {
                                            SkIRect* clip_bounds) override;
 
   bool ToPixmap(SkPixmap* output) override;
-  void AnnotateRectWithURL(const SkRect& rect, SkData* data) override;
-  void AnnotateNamedDestination(const SkPoint& point, SkData* data) override;
-  void AnnotateLinkToDestination(const SkRect& rect, SkData* data) override;
+  void Annotate(AnnotationType type,
+                const SkRect& rect,
+                sk_sp<SkData> data) override;
 
   void PlaybackPaintRecord(sk_sp<const PaintRecord> record) override;