Revert of move annotations to canvas virtual

include/core/SkWriter32.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 SkWriter32_DEFINED
@@ skipping 188 matching lines @@
      */
     void writeString(const char* str, size_t len = (size_t)-1);
 
     /**
      *  Computes the size (aligned to multiple of 4) need to write the string
      *  in a call to writeString(). If the length is not specified, it will be
      *  computed by calling strlen().
      */
     static size_t WriteStringSize(const char* str, size_t len = (size_t)-1);
 
-    void writeData(const SkData* data) {
-        uint32_t len = data ? SkToU32(data->size()) : 0;
-        this->write32(len);
-        if (data) {
-            this->writePad(data->data(), len);
-        }
-    }
-
-    static size_t WriteDataSize(const SkData* data) {
-        return 4 + SkAlign4(data ? data->size() : 0);
-    }
-
     /**
      *  Move the cursor back to offset bytes from the beginning.
      *  offset must be a multiple of 4 no greater than size().
      */
     void rewindToOffset(size_t offset) {
         SkASSERT(SkAlign4(offset) == offset);
         SkASSERT(offset <= bytesWritten());
         fUsed = offset;
     }
 
@@ skipping 42 matching lines @@
     union {
         void*   fPtrAlignment;
         double  fDoubleAlignment;
         char    fStorage[SIZE];
     } fData;
 
     typedef SkWriter32 INHERITED;
 };
 
 #endif