Revert of move annotations to canvas virtual

src/utils/SkDumpCanvas.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDumpCanvas.h"
 
 #ifdef SK_DEVELOPER
-#include "SkData.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTextBlob.h"
 #include <stdarg.h>
 #include <stdio.h>
 
 // needed just to know that these are all subclassed from SkFlattenable
@@ skipping 453 matching lines @@
               cubics[SkPatchUtils::kTopP3_CubicCtrlPts].fY,
               cubics[SkPatchUtils::kBottomP3_CubicCtrlPts].fX,
               cubics[SkPatchUtils::kBottomP3_CubicCtrlPts].fY,
               cubics[SkPatchUtils::kBottomP0_CubicCtrlPts].fX,
               cubics[SkPatchUtils::kBottomP0_CubicCtrlPts].fY,
               colors[0], colors[1], colors[2], colors[3],
               texCoords[0].x(), texCoords[0].y(), texCoords[1].x(), texCoords[1].y(),
               texCoords[2].x(), texCoords[2].y(), texCoords[3].x(), texCoords[3].y());
 }
 
-void SkDumpCanvas::onDrawAnnotation(const SkRect& rect, const char key[], SkData* value) {
-    SkString str;
-    toString(rect, &str);
-    this->dump(kDrawAnnotation_Verb, nullptr, "drawAnnotation(%s \"%s\" (%zu))",
-               str.c_str(), key, value ? value->size() : 0);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFormatDumper::SkFormatDumper(void (*proc)(const char*, void*), void* refcon) {
     fProc = proc;
     fRefcon = refcon;
 }
 
 static void appendPtr(SkString* str, const void* ptr, const char name[]) {
     if (ptr) {
@@ skipping 46 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void dumpToDebugf(const char text[], void*) {
     SkDebugf("%s\n", text);
 }
 
 SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, nullptr) {}
 
 #endif