Revert of move annotations to canvas virtual

src/core/SkCanvas.cpp

Index: src/core/SkCanvas.cpp
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index f3f38386bd1556e36e5a1f54ba352cf4acc16edf..a628105001dba8835a071ee7ca9dcde4af645036 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1973,12 +1973,6 @@
     this->onDrawAtlas(atlas, xform, tex, colors, count, mode, cull, paint);
 }
 
-void SkCanvas::drawAnnotation(const SkRect& rect, const char key[], SkData* value) {
-    if (key) {
-        this->onDrawAnnotation(rect, key, value);
-    }
-}
-
 void SkCanvas::legacy_drawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
                                     const SkPaint* paint, SrcRectConstraint constraint) {
     if (src) {
@@ -2731,17 +2725,6 @@
     LOOPER_END
 }
 
-void SkCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) {
-    SkASSERT(key);
-
-    SkPaint paint;
-    LOOPER_BEGIN(paint, SkDrawFilter::kRect_Type, nullptr)
-    while (iter.next()) {
-        iter.fDevice->drawAnnotation(iter, rect, key, value);
-    }
-    LOOPER_END
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // These methods are NOT virtual, and therefore must call back into virtual
 // methods, rather than actually drawing themselves.