change old picture serialization to really handle images

include/core/SkWriteBuffer.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 SkWriteBuffer_DEFINED
 #define SkWriteBuffer_DEFINED
@@ skipping 55 matching lines @@
     void writeColorArray(const SkColor* color, uint32_t count);
     void writePoint(const SkPoint& point);
     void writePointArray(const SkPoint* point, uint32_t count);
     void writeMatrix(const SkMatrix& matrix);
     void writeIRect(const SkIRect& rect);
     void writeRect(const SkRect& rect);
     void writeRegion(const SkRegion& region);
     void writePath(const SkPath& path);
     size_t writeStream(SkStream* stream, size_t length);
     void writeBitmap(const SkBitmap& bitmap);
+    void writeImage(const SkImage*);
     void writeTypeface(SkTypeface* typeface);
     void writePaint(const SkPaint& paint) { paint.flatten(*this); }
 
     bool writeToStream(SkWStream*);
     void writeToMemory(void* dst) { fWriter.flatten(dst); }
 
     SkFactorySet* setFactoryRecorder(SkFactorySet*);
     SkNamedFactorySet* setNamedFactoryRecorder(SkNamedFactorySet*);
 
     SkRefCntSet* getTypefaceRecorder() const { return fTFSet; }
@@ skipping 13 matching lines @@
      * e.g. SkBitmaps.
      *
      * Calls ref() on the serializer.
      *
      * TODO: Encode SkImage pixels as well.
      *
      * Incompatible with the SkBitmapHeap. If an encoder is set fBitmapHeap will
      * be set to NULL in release and crash in debug.
      */
     void setPixelSerializer(SkPixelSerializer*);
+    SkPixelSerializer* getPixelSerializer() const { return fPixelSerializer; }
 
 private:
     bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
 
     const uint32_t fFlags;
     SkFactorySet* fFactorySet;
     SkNamedFactorySet* fNamedFactorySet;
     SkWriter32 fWriter;
 
     SkBitmapHeap* fBitmapHeap;
     SkRefCntSet* fTFSet;
 
     SkAutoTUnref<SkPixelSerializer> fPixelSerializer;
 };
 
 #endif // SkWriteBuffer_DEFINED