Refactor read and write buffers.

src/core/SkOrderedWriteBuffer.h

Index: src/core/SkOrderedWriteBuffer.h
diff --git a/src/core/SkOrderedWriteBuffer.h b/src/core/SkOrderedWriteBuffer.h
deleted file mode 100644
index 1f10152293dfcc69441a945121b123f14a6004e0..0000000000000000000000000000000000000000
--- a/src/core/SkOrderedWriteBuffer.h
+++ /dev/null
@@ -1,115 +0,0 @@
-
-/*
- * 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 SkOrderedWriteBuffer_DEFINED
-#define SkOrderedWriteBuffer_DEFINED
-
-#include "SkFlattenableBuffers.h"
-
-#include "SkRefCnt.h"
-#include "SkBitmapHeap.h"
-#include "SkPath.h"
-#include "SkPicture.h"
-#include "SkWriter32.h"
-
-class SkBitmap;
-class SkFlattenable;
-class SkFactorySet;
-class SkNamedFactorySet;
-class SkRefCntSet;
-
-class SkOrderedWriteBuffer : public SkFlattenableWriteBuffer {
-public:
-    SkOrderedWriteBuffer();
-    SkOrderedWriteBuffer(void* initialStorage, size_t storageSize);
-    virtual ~SkOrderedWriteBuffer();
-
-    virtual bool isOrderedBinaryBuffer() SK_OVERRIDE { return true; }
-    virtual SkOrderedWriteBuffer* getOrderedBinaryBuffer() SK_OVERRIDE { return this; }
-
-    SkWriter32* getWriter32() { return &fWriter; }
-    void reset(void* storage = NULL, size_t storageSize = 0) {
-        fWriter.reset(storage, storageSize);
-    }
-
-    void writeToMemory(void* dst) { fWriter.flatten(dst); }
-    uint32_t* reserve(size_t size) { return fWriter.reserve(size); }
-
-    size_t bytesWritten() const { return fWriter.bytesWritten(); }
-    // Deprecated.  Please call bytesWritten instead.  TODO(mtklein): clean up
-    size_t size() const { return this->bytesWritten(); }
-
-    virtual void writeByteArray(const void* data, size_t size) SK_OVERRIDE;
-    virtual void writeBool(bool value) SK_OVERRIDE;
-    virtual void writeFixed(SkFixed value) SK_OVERRIDE;
-    virtual void writeScalar(SkScalar value) SK_OVERRIDE;
-    virtual void writeScalarArray(const SkScalar* value, uint32_t count) SK_OVERRIDE;
-    virtual void writeInt(int32_t value) SK_OVERRIDE;
-    virtual void writeIntArray(const int32_t* value, uint32_t count) SK_OVERRIDE;
-    virtual void writeUInt(uint32_t value) SK_OVERRIDE;
-    virtual void write32(int32_t value) SK_OVERRIDE;
-    virtual void writeString(const char* value) SK_OVERRIDE;
-    virtual void writeEncodedString(const void* value, size_t byteLength,
-                                    SkPaint::TextEncoding encoding) SK_OVERRIDE;
-
-    virtual void writeFlattenable(const SkFlattenable* flattenable) SK_OVERRIDE;
-    virtual void writeColor(const SkColor& color) SK_OVERRIDE;
-    virtual void writeColorArray(const SkColor* color, uint32_t count) SK_OVERRIDE;
-    virtual void writePoint(const SkPoint& point) SK_OVERRIDE;
-    virtual void writePointArray(const SkPoint* point, uint32_t count) SK_OVERRIDE;
-    virtual void writeMatrix(const SkMatrix& matrix) SK_OVERRIDE;
-    virtual void writeIRect(const SkIRect& rect)SK_OVERRIDE;
-    virtual void writeRect(const SkRect& rect) SK_OVERRIDE;
-    virtual void writeRegion(const SkRegion& region) SK_OVERRIDE;
-    virtual void writePath(const SkPath& path) SK_OVERRIDE;
-    virtual size_t writeStream(SkStream* stream, size_t length) SK_OVERRIDE;
-
-    virtual void writeBitmap(const SkBitmap& bitmap) SK_OVERRIDE;
-    virtual void writeTypeface(SkTypeface* typeface) SK_OVERRIDE;
-
-    virtual bool writeToStream(SkWStream*) SK_OVERRIDE;
-
-    SkFactorySet* setFactoryRecorder(SkFactorySet*);
-    SkNamedFactorySet* setNamedFactoryRecorder(SkNamedFactorySet*);
-
-    SkRefCntSet* getTypefaceRecorder() const { return fTFSet; }
-    SkRefCntSet* setTypefaceRecorder(SkRefCntSet*);
-
-    /**
-     * Set an SkBitmapHeap to store bitmaps rather than flattening.
-     *
-     * Incompatible with an EncodeBitmap function. If an EncodeBitmap function is set, setting an
-     * SkBitmapHeap will set the function to NULL in release mode and crash in debug.
-     */
-    void setBitmapHeap(SkBitmapHeap*);
-
-    /**
-     * Provide a function to encode an SkBitmap to an SkData. writeBitmap will attempt to use
-     * bitmapEncoder to store the SkBitmap. If the reader does not provide a function to decode, it
-     * will not be able to restore SkBitmaps, but will still be able to read the rest of the stream.
-     * bitmapEncoder will never be called with a NULL pixelRefOffset.
-     *
-     * Incompatible with the SkBitmapHeap. If an encoder is set fBitmapHeap will be set to NULL in
-     * release and crash in debug.
-     */
-    void setBitmapEncoder(SkPicture::EncodeBitmap bitmapEncoder);
-
-private:
-    SkFactorySet* fFactorySet;
-    SkNamedFactorySet* fNamedFactorySet;
-    SkWriter32 fWriter;
-
-    SkBitmapHeap* fBitmapHeap;
-    SkRefCntSet* fTFSet;
-
-    SkPicture::EncodeBitmap fBitmapEncoder;
-
-    typedef SkFlattenableWriteBuffer INHERITED;
-};
-
-#endif // SkOrderedWriteBuffer_DEFINED