Back PaintRecord with PaintOpBuffer instead of SkPicture

cc/paint/skia_paint_canvas.cc

Index: cc/paint/skia_paint_canvas.cc
diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc
index a4ab9c19057a84c7114e7fe603223acee209f728..853f42fd3bdf5ce2f310033bdd13f30565f8ff07 100644
--- a/cc/paint/skia_paint_canvas.cc
+++ b/cc/paint/skia_paint_canvas.cc
@@ -2,7 +2,7 @@
 // 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 "cc/paint/skia_paint_canvas.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
@@ -75,7 +75,7 @@ int SkiaPaintCanvas::saveLayer(const SkRect* bounds, const PaintFlags* flags) {
   return canvas_->saveLayer(bounds, ToSkPaint(flags));
 }
 
-int SkiaPaintCanvas::saveLayerAlpha(const SkRect* bounds, U8CPU alpha) {
+int SkiaPaintCanvas::saveLayerAlpha(const SkRect* bounds, uint8_t alpha) {
   return canvas_->saveLayerAlpha(bounds, alpha);
 }
 
@@ -307,18 +307,22 @@ bool SkiaPaintCanvas::ToPixmap(SkPixmap* output) {
   return true;
 }
 
-void SkiaPaintCanvas::AnnotateRectWithURL(const SkRect& rect, SkData* data) {
-  SkAnnotateRectWithURL(canvas_, rect, data);
-}
-
-void SkiaPaintCanvas::AnnotateNamedDestination(const SkPoint& point,
-                                               SkData* data) {
-  SkAnnotateNamedDestination(canvas_, point, data);
-}
-
-void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect,
-                                                SkData* data) {
-  SkAnnotateLinkToDestination(canvas_, rect, data);
+void SkiaPaintCanvas::Annotate(AnnotationType type,
+                               const SkRect& rect,
+                               sk_sp<SkData> data) {
+  switch (type) {
+    case AnnotationType::URL:
+      SkAnnotateRectWithURL(canvas_, rect, data.get());
+      break;
+    case AnnotationType::LINK_TO_DESTINATION:
+      SkAnnotateLinkToDestination(canvas_, rect, data.get());
+      break;
+    case AnnotationType::NAMED_DESTINATION: {
+      SkPoint point = SkPoint::Make(rect.x(), rect.y());
+      SkAnnotateNamedDestination(canvas_, point, data.get());
+      break;
+    }
+  }
 }
 
 }  // namespace cc