Revert of move annotations to canvas virtual

src/core/SkAnnotation.cpp

Index: src/core/SkAnnotation.cpp
diff --git a/src/core/SkAnnotation.cpp b/src/core/SkAnnotation.cpp
index 09a6296fbabf7f45b19300d24132f4a35fe21dea..84d41fc66933625863597dc137ce039c3a8dd3d1 100644
--- a/src/core/SkAnnotation.cpp
+++ b/src/core/SkAnnotation.cpp
@@ -6,10 +6,38 @@
  */
 
 #include "SkAnnotation.h"
-#include "SkAnnotationKeys.h"
-#include "SkCanvas.h"
+#include "SkData.h"
+#include "SkPaint.h"
 #include "SkPoint.h"
-#include "SkRect.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
+
+SkAnnotation::SkAnnotation(const char key[], SkData* value) : fKey(key) {
+    if (nullptr == value) {
+        value = SkData::NewEmpty();
+    } else {
+        value->ref();
+    }
+    fData = value;
+}
+
+SkAnnotation::~SkAnnotation() {
+    fData->unref();
+}
+
+SkData* SkAnnotation::find(const char key[]) const {
+    return fKey.equals(key) ? fData : nullptr;
+}
+
+SkAnnotation::SkAnnotation(SkReadBuffer& buffer) {
+    buffer.readString(&fKey);
+    fData = buffer.readByteArrayAsData();
+}
+
+void SkAnnotation::writeToBuffer(SkWriteBuffer& buffer) const {
+    buffer.writeString(fKey.c_str());
+    buffer.writeDataAsByteArray(fData);
+}
 
 const char* SkAnnotationKeys::URL_Key() {
     return "SkAnnotationKey_URL";
@@ -23,26 +51,37 @@
     return "SkAnnotationKey_Link_Named_Dest";
 };
 
-//////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SkCanvas.h"
+
+static void annotate_paint(SkPaint& paint, const char* key, SkData* value) {
+    paint.setAnnotation(SkAnnotation::Create(key, value))->unref();
+}
 
 void SkAnnotateRectWithURL(SkCanvas* canvas, const SkRect& rect, SkData* value) {
     if (nullptr == value) {
         return;
     }
-    canvas->drawAnnotation(rect, SkAnnotationKeys::URL_Key(), value);
+    SkPaint paint;
+    annotate_paint(paint, SkAnnotationKeys::URL_Key(), value);
+    canvas->drawRect(rect, paint);
 }
 
 void SkAnnotateNamedDestination(SkCanvas* canvas, const SkPoint& point, SkData* name) {
     if (nullptr == name) {
         return;
     }
-    const SkRect rect = SkRect::MakeXYWH(point.x(), point.y(), 0, 0);
-    canvas->drawAnnotation(rect, SkAnnotationKeys::Define_Named_Dest_Key(), name);
+    SkPaint paint;
+    annotate_paint(paint, SkAnnotationKeys::Define_Named_Dest_Key(), name);
+    canvas->drawPoint(point.x(), point.y(), paint);
 }
 
 void SkAnnotateLinkToDestination(SkCanvas* canvas, const SkRect& rect, SkData* name) {
     if (nullptr == name) {
         return;
     }
-    canvas->drawAnnotation(rect, SkAnnotationKeys::Link_Named_Dest_Key(), name);
+    SkPaint paint;
+    annotate_paint(paint, SkAnnotationKeys::Link_Named_Dest_Key(), name);
+    canvas->drawRect(rect, paint);
 }