Revert of move annotations to canvas virtual

src/core/SkPictureRecord.cpp

Index: src/core/SkPictureRecord.cpp
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 2718ee999df0ea2d03e1c35ae3dbdc46d3fc5141..2822a1ac1643a2c0681418b79ae1ec75baf4c326 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -774,18 +774,6 @@
     if (cull) {
         fWriter.write(cull, sizeof(SkRect));
     }
-    this->validate(initialOffset, size);
-}
-
-void SkPictureRecord::onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) {
-    size_t keyLen = fWriter.WriteStringSize(key);
-    size_t valueLen = fWriter.WriteDataSize(value);
-    size_t size = 4 + sizeof(SkRect) + keyLen + valueLen;
-
-    size_t initialOffset = this->addDraw(DRAW_ANNOTATION, &size);
-    this->addRect(rect);
-    fWriter.writeString(key);
-    fWriter.writeData(value);
     this->validate(initialOffset, size);
 }