Revert of move annotations to canvas virtual

src/core/SkPictureRecord.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 "SkPictureRecord.h"
 #include "SkDevice.h"
 #include "SkImage_Base.h"
@@ skipping 759 matching lines @@
     if (colors) {
         fWriter.write(colors, count * sizeof(SkColor));
         this->addInt(mode);
     }
     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);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 SkSurface* SkPictureRecord::onNewSurface(const SkImageInfo& info, const SkSurfaceProps&) {
     return nullptr;
 }
 
 // If we already have a stored, can we reuse it instead of also storing b?
 static bool equivalent(const SkBitmap& a, const SkBitmap& b) {
     if (a.info() != b.info() || a.pixelRefOrigin() != b.pixelRefOrigin()) {
         // Requiring a.info() == b.info() may be overkill in some cases (alphatype mismatch),
@@ skipping 167 matching lines @@
 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
     int index = fTextBlobRefs.count();
     *fTextBlobRefs.append() = blob;
     blob->ref();
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////