Revert of move annotations to canvas virtual

src/core/SkReader32.h

+
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkReader32_DEFINED
 #define SkReader32_DEFINED
 
-#include "SkData.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkScalar.h"
 
 class SkString;
 
 class SkReader32 : SkNoncopyable {
 public:
@@ skipping 105 matching lines @@
      *  string within the reader's buffer.
      */
     const char* readString(size_t* len = nullptr);
 
     /**
      *  Read the string (written by SkWriter32::writeString) and return it in
      *  copy (if copy is not null). Return the length of the string.
      */
     size_t readIntoString(SkString* copy);
 
-    SkData* readData() {
-        uint32_t byteLength = this->readU32();
-        if (0 == byteLength) {
-            return SkData::NewEmpty();
-        }
-        return SkData::NewWithCopy(this->skip(byteLength), byteLength);
-    }
-
 private:
     template <typename T> bool readObjectFromMemory(T* obj) {
         size_t size = obj->readFromMemory(this->peek(), this->available());
         // If readFromMemory() fails (which means that available() was too small), it returns 0
         bool success = (size > 0) && (size <= this->available()) && (SkAlign4(size) == size);
         // In case of failure, we want to skip to the end
         (void)this->skip(success ? size : this->available());
         return success;
     }
 
     // these are always 4-byte aligned
     const char* fCurr;  // current position within buffer
     const char* fStop;  // end of buffer
     const char* fBase;  // beginning of buffer
 
 #ifdef SK_DEBUG
     static bool ptr_align_4(const void* ptr) {
         return (((const char*)ptr - (const char*)nullptr) & 3) == 0;
     }
 #endif
 };
 
 #endif