Revert of move annotations to canvas virtual

include/utils/SkDumpCanvas.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkDumpCanvas_DEFINED
 #define SkDumpCanvas_DEFINED
 
@@ skipping 30 matching lines @@
         kDrawRect_Verb,
         kDrawRRect_Verb,
         kDrawDRRect_Verb,
         kDrawPath_Verb,
         kDrawBitmap_Verb,
         kDrawText_Verb,
         kDrawPicture_Verb,
         kDrawVertices_Verb,
         kDrawPatch_Verb,
         kDrawData_Verb, // obsolete
-        kDrawAnnotation_Verb,
 
         kCull_Verb
     };
 
     /** Subclasses of this are installed on the DumpCanvas, and then called for
         each drawing command.
      */
     class Dumper : public SkRefCnt {
     public:
         
@@ skipping 52 matching lines @@
                         const SkColor colors[], SkXfermode* xmode,
                         const uint16_t indices[], int indexCount,
                         const SkPaint&) override;
 
     void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override;
     void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
-    void onDrawAnnotation(const SkRect&, const char key[], SkData* value) override;
 
     static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle);
 
 private:
     Dumper* fDumper;
     int     fNestLevel; // for nesting recursive elements like pictures
 
     void dump(Verb, const SkPaint*, const char format[], ...);
 
     typedef SkCanvas INHERITED;
@@ skipping 24 matching lines @@
 public:
     SkDebugfDumper();
 
 private:
     typedef SkFormatDumper INHERITED;
 };
 
 #endif
 
 #endif