Revert of move annotations to canvas virtual

include/private/SkRecords.h

Index: include/private/SkRecords.h
diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h
index 1e274e9f46a2fc0275ed9f1510abedcc78c06295..ecd73a12d9b945a96b44a1550c36f0c8606ce5cd 100644
--- a/include/private/SkRecords.h
+++ b/include/private/SkRecords.h
@@ -8,7 +8,6 @@
 #ifndef SkRecords_DEFINED
 #define SkRecords_DEFINED
 
-#include "SkData.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 #include "SkImageFilter.h"
@@ -18,7 +17,6 @@
 #include "SkRect.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
-#include "SkString.h"
 #include "SkTextBlob.h"
 
 namespace SkRecords {
@@ -68,8 +66,7 @@
     M(DrawRect)                                                     \
     M(DrawTextBlob)                                                 \
     M(DrawAtlas)                                                    \
-    M(DrawVertices)                                                 \
-    M(DrawAnnotation)
+    M(DrawVertices)
 
 // Defines SkRecords::Type, an enum of all record types.
 #define ENUM(T) T##_Type,
@@ -361,10 +358,7 @@
         RefBox<SkXfermode> xmode;
         PODArray<uint16_t> indices;
         int indexCount);
-RECORD(DrawAnnotation, 0,
-       SkRect rect;
-       SkString key;
-       RefBox<SkData> value);
+
 #undef RECORD
 
 }  // namespace SkRecords