Refactor read and write buffers.
Eliminates SkFlattenable{Read,Write}Buffer, promoting SkOrdered{Read,Write}Buffer
a step each in the hierarchy.
What used to be this:
SkFlattenableWriteBuffer -> SkOrderedWriteBuffer
SkFlattenableReadBuffer -> SkOrderedReadBuffer
SkFlattenableReadBuffer -> SkValidatingReadBuffer
is now
SkWriteBuffer
SkReadBuffer -> SkValidatingReadBuffer
Benefits:
- code is simpler, names are less wordy
- the generic SkFlattenableFooBuffer code in SkPaint was incorrect; removed
- write buffers are completely devirtualized, important for record speed
This refactoring was mostly mechanical. You aren't going to find anything
interesting in files with less than 10 lines changed.
BUG=skia:
R=reed@google.com, scroggo@google.com, djsollen@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/134163010
git-svn-id: http://skia.googlecode.com/svn/trunk@13245 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkAnnotation.h b/include/core/SkAnnotation.h
index 4d17b79..872bb94 100644
--- a/include/core/SkAnnotation.h
+++ b/include/core/SkAnnotation.h
@@ -12,8 +12,8 @@
#include "SkString.h"
class SkData;
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
class SkStream;
class SkWStream;
struct SkPoint;
@@ -32,8 +32,8 @@
*/
SkData* find(const char key[]) const;
- SkAnnotation(SkFlattenableReadBuffer&);
- void writeToBuffer(SkFlattenableWriteBuffer&) const;
+ SkAnnotation(SkReadBuffer&);
+ void writeToBuffer(SkWriteBuffer&) const;
private:
SkString fKey;
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 2cdac27..4951cf1 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -658,8 +658,8 @@
buffers as they can optimize the recording process and avoid recording
duplicate bitmaps and pixelRefs.
*/
- void flatten(SkFlattenableWriteBuffer&) const;
- void unflatten(SkFlattenableReadBuffer&);
+ void flatten(SkWriteBuffer&) const;
+ void unflatten(SkReadBuffer&);
SkDEBUGCODE(void validate() const;)
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 106e5bb..a5ffca8 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -135,7 +135,7 @@
protected:
SkColorFilter() {}
- SkColorFilter(SkFlattenableReadBuffer& rb) : INHERITED(rb) {}
+ SkColorFilter(SkReadBuffer& rb) : INHERITED(rb) {}
private:
typedef SkFlattenable INHERITED;
diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h
index c379068..5b8a86d 100644
--- a/include/core/SkColorShader.h
+++ b/include/core/SkColorShader.h
@@ -52,8 +52,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
protected:
- SkColorShader(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkColorShader(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
diff --git a/include/core/SkColorTable.h b/include/core/SkColorTable.h
index 52300fc..e4c8c86 100644
--- a/include/core/SkColorTable.h
+++ b/include/core/SkColorTable.h
@@ -75,8 +75,8 @@
SkDEBUGCODE(f16BitCacheLockCount -= 1);
}
- explicit SkColorTable(SkFlattenableReadBuffer&);
- void writeToBuffer(SkFlattenableWriteBuffer&) const;
+ explicit SkColorTable(SkReadBuffer&);
+ void writeToBuffer(SkWriteBuffer&) const;
private:
SkPMColor* fColors;
diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h
index 524161b..1fefd13 100644
--- a/include/core/SkComposeShader.h
+++ b/include/core/SkComposeShader.h
@@ -43,8 +43,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader)
protected:
- SkComposeShader(SkFlattenableReadBuffer& );
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkComposeShader(SkReadBuffer& );
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h
index d6028ff..4609c1d 100644
--- a/include/core/SkDrawLooper.h
+++ b/include/core/SkDrawLooper.h
@@ -68,7 +68,7 @@
protected:
SkDrawLooper() {}
- SkDrawLooper(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkDrawLooper(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
typedef SkFlattenable INHERITED;
diff --git a/include/core/SkEmptyShader.h b/include/core/SkEmptyShader.h
index 08c131d..3f7dae4 100644
--- a/include/core/SkEmptyShader.h
+++ b/include/core/SkEmptyShader.h
@@ -34,7 +34,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmptyShader)
protected:
- SkEmptyShader(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkEmptyShader(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
typedef SkShader INHERITED;
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index 5a6e2ae..ee7a433 100644
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -12,8 +12,8 @@
#include "SkRefCnt.h"
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(flattenable) \
SkFlattenable::Registrar(#flattenable, flattenable::CreateProc, \
@@ -32,7 +32,7 @@
#define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \
virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } \
- static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { \
+ static SkFlattenable* CreateProc(SkReadBuffer& buffer) { \
return SkNEW_ARGS(flattenable, (buffer)); \
}
@@ -67,7 +67,7 @@
SK_DECLARE_INST_COUNT(SkFlattenable)
- typedef SkFlattenable* (*Factory)(SkFlattenableReadBuffer&);
+ typedef SkFlattenable* (*Factory)(SkReadBuffer&);
SkFlattenable() {}
@@ -94,19 +94,19 @@
}
};
-protected:
- SkFlattenable(SkFlattenableReadBuffer&) {}
/** Override this to write data specific to your subclass into the buffer,
being sure to call your super-class' version first. This data will later
be passed to your Factory function, returned by getFactory().
*/
- virtual void flatten(SkFlattenableWriteBuffer&) const;
+ virtual void flatten(SkWriteBuffer&) const;
+
+protected:
+ SkFlattenable(SkReadBuffer&) {}
private:
static void InitializeFlattenablesIfNeeded();
friend class SkGraphics;
- friend class SkFlattenableWriteBuffer;
typedef SkRefCnt INHERITED;
};
diff --git a/include/core/SkFlattenableBuffers.h b/include/core/SkFlattenableBuffers.h
index aa61f21..3e5d5b9 100644
--- a/include/core/SkFlattenableBuffers.h
+++ b/include/core/SkFlattenableBuffers.h
@@ -1,260 +1,10 @@
-
-/*
- * Copyright 2012 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
+// Temporary shim to keep a couple dependencies working in Chromium.
#ifndef SkFlattenableBuffers_DEFINED
#define SkFlattenableBuffers_DEFINED
-#include "SkColor.h"
-#include "SkData.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
-class SkBitmap;
-class SkDrawLooper;
-class SkFlattenable;
-struct SkIRect;
-class SkMatrix;
-class SkOrderedReadBuffer;
-class SkOrderedWriteBuffer;
-class SkPath;
-class SkPixelRef;
-struct SkRect;
-class SkRegion;
-class SkStream;
-class SkString;
-class SkTypeface;
-class SkUnitMapper;
-class SkWStream;
+typedef SkReadBuffer SkFlattenableReadBuffer;
-class SkFlattenableReadBuffer {
-public:
- SkFlattenableReadBuffer();
- virtual ~SkFlattenableReadBuffer();
-
- bool isOrderedBinaryBuffer() { return NULL != getOrderedBinaryBuffer(); }
- virtual SkOrderedReadBuffer* getOrderedBinaryBuffer() { return NULL; }
-
- enum Flags {
- kCrossProcess_Flag = 1 << 0,
- kScalarIsFloat_Flag = 1 << 1,
- kPtrIs64Bit_Flag = 1 << 2,
- /** The kValidation_Flag is used to force stream validations (by making
- * sure that no operation reads past the end of the stream, for example)
- * and error handling if any reading operation yields an invalid value.
- */
- kValidation_Flag = 1 << 3,
- };
-
- void setFlags(uint32_t flags) { fFlags = flags; }
- uint32_t getFlags() const { return fFlags; }
-
- bool isCrossProcess() const { return SkToBool(fFlags & (kCrossProcess_Flag | kValidation_Flag)); }
- bool isScalarFloat() const { return SkToBool(fFlags & kScalarIsFloat_Flag); }
- bool isPtr64Bit() const { return SkToBool(fFlags & kPtrIs64Bit_Flag); }
- bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
-
- // primitives
- virtual bool readBool() = 0;
- virtual SkColor readColor() = 0;
- virtual SkFixed readFixed() = 0;
- virtual int32_t readInt() = 0;
- virtual SkScalar readScalar() = 0;
- virtual uint32_t readUInt() = 0;
- virtual int32_t read32() = 0;
-
- // strings -- the caller is responsible for freeing the string contents
- virtual void readString(SkString* string) = 0;
- virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) = 0;
-
- /**
- @param type This parameter is only used when using SkValidatingReadBuffer. It will verify
- that the object about to be deserialized is of the given type or early return
- NULL otherwise. The type provided here is the type of the base class of the
- object to deserialize.
- */
- virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) = 0;
-
- SkColorFilter* readColorFilter();
- SkDrawLooper* readDrawLooper();
- SkImageFilter* readImageFilter();
- SkMaskFilter* readMaskFilter();
- SkPathEffect* readPathEffect();
- SkPixelRef* readPixelRef();
- SkRasterizer* readRasterizer();
- SkShader* readShader();
- SkUnitMapper* readUnitMapper();
- SkXfermode* readXfermode();
-
- // common data structures
- virtual void readPoint(SkPoint* point) = 0;
- virtual void readMatrix(SkMatrix* matrix) = 0;
- virtual void readIRect(SkIRect* rect) = 0;
- virtual void readRect(SkRect* rect) = 0;
- virtual void readRegion(SkRegion* region) = 0;
- virtual void readPath(SkPath* path) = 0;
-
- // binary data and arrays
-
- /**
- * In the following read.*Array(...) functions, the size parameter specifies the allocation
- * size in number of elements (or in bytes, for void*) of the pointer parameter. If the
- * pointer parameter's size does not match the size to be read, the pointer parameter's memory
- * will then stay uninitialized, the cursor will be moved to the end of the stream and, in the
- * case where isValidating() is true, an error flag will be set internally (see
- * SkValidatingReadBuffer).
- * If the sizes match, then "size" amount of memory will be read.
- *
- * @param size amount of memory expected to be read
- * @return true if the size parameter matches the size to be read, false otherwise
- */
- virtual bool readByteArray(void* value, size_t size) = 0;
- virtual bool readColorArray(SkColor* colors, size_t size) = 0;
- virtual bool readIntArray(int32_t* values, size_t size) = 0;
- virtual bool readPointArray(SkPoint* points, size_t size) = 0;
- virtual bool readScalarArray(SkScalar* values, size_t size) = 0;
-
- /** This helper peeks into the buffer and reports back the length of the next array in
- * the buffer but does not change the state of the buffer.
- */
- virtual uint32_t getArrayCount() = 0;
-
- // helper functions
- virtual void* readFunctionPtr();
- virtual void readPaint(SkPaint* paint);
-
- virtual void readBitmap(SkBitmap* bitmap) = 0;
- virtual SkTypeface* readTypeface() = 0;
-
- // helper function for classes with const SkPoint members
- SkPoint readPoint() {
- SkPoint point;
- this->readPoint(&point);
- return point;
- }
-
- SkData* readByteArrayAsData() {
- size_t len = this->getArrayCount();
- void* buffer = NULL;
- if (this->validateAvailable(len)) {
- buffer = sk_malloc_throw(len);
- (void)this->readByteArray(buffer, len);
- } else {
- len = 0;
- }
- return SkData::NewFromMalloc(buffer, len);
- }
-
- /** This function validates that the isValid input parameter is true
- * If isValidating() is false, then true is always returned
- * If isValidating() is true, then true is returned until validate() is called with isValid
- * set to false. When isValid is false, an error flag will be set internally and, from that
- * point on, validate() will return false. The error flag cannot be unset.
- *
- * @param isValid result of a test that is expected to be true
- */
- virtual bool validate(bool isValid);
-
- /** This function returns true by default
- * If isValidating() is true, it will return false if the internal error flag is set.
- * Otherwise, it will return true.
- */
- virtual bool isValid() const { return true; }
-
- /** This function returns true by default
- * If isValidating() is true, it will return whether there's
- * at least "size" memory left to read in the stream.
- *
- * @param size amount of memory that should still be available
- */
- virtual bool validateAvailable(size_t size) { return true; }
-
-private:
- template <typename T> T* readFlattenableT();
- uint32_t fFlags;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
-class SkFlattenableWriteBuffer {
-public:
- SkFlattenableWriteBuffer();
- virtual ~SkFlattenableWriteBuffer();
-
- virtual bool isOrderedBinaryBuffer() { return false; }
- virtual SkOrderedWriteBuffer* getOrderedBinaryBuffer() { sk_throw(); return NULL; }
-
- // primitives
- virtual void writeByteArray(const void* data, size_t size) = 0;
- virtual void writeBool(bool value) = 0;
- virtual void writeFixed(SkFixed value) = 0;
- virtual void writeScalar(SkScalar value) = 0;
- virtual void writeScalarArray(const SkScalar* value, uint32_t count) = 0;
- virtual void writeInt(int32_t value) = 0;
- virtual void writeIntArray(const int32_t* value, uint32_t count) = 0;
- virtual void writeUInt(uint32_t value) = 0;
- virtual void write32(int32_t value) = 0; // printf in hex
- virtual void writeString(const char* value) = 0;
- virtual void writeEncodedString(const void* value, size_t byteLength,
- SkPaint::TextEncoding encoding) = 0;
-
- // common data structures
- virtual void writeFlattenable(const SkFlattenable* flattenable) = 0;
- virtual void writeColor(const SkColor& color) = 0;
- virtual void writeColorArray(const SkColor* color, uint32_t count) = 0;
- virtual void writePoint(const SkPoint& point) = 0;
- virtual void writePointArray(const SkPoint* points, uint32_t count) = 0;
- virtual void writeMatrix(const SkMatrix& matrix) = 0;
- virtual void writeIRect(const SkIRect& rect) = 0;
- virtual void writeRect(const SkRect& rect) = 0;
- virtual void writeRegion(const SkRegion& region) = 0;
- virtual void writePath(const SkPath& path) = 0;
- virtual size_t writeStream(SkStream* stream, size_t length) = 0;
-
- // helper functions
- virtual void writeFunctionPtr(void* ptr);
- virtual void writePaint(const SkPaint& paint);
-
- virtual void writeBitmap(const SkBitmap& bitmap) = 0;
- virtual void writeTypeface(SkTypeface* typeface) = 0;
-
- virtual bool writeToStream(SkWStream*) = 0;
-
- enum Flags {
- kCrossProcess_Flag = 0x01,
- /** The kValidation_Flag is used here to make sure the write operation
- * is symmetric with the read operation using the equivalent flag
- * SkFlattenableReadBuffer::kValidation_Flag.
- */
- kValidation_Flag = 0x02,
- };
-
- uint32_t getFlags() const { return fFlags; }
- void setFlags(uint32_t flags) { fFlags = flags; }
-
- bool isCrossProcess() const {
- return SkToBool(fFlags & (kCrossProcess_Flag | kValidation_Flag));
- }
-
- bool isValidating() const {
- return SkToBool(fFlags & kValidation_Flag);
- }
-
- bool persistTypeface() const { return (fFlags & kCrossProcess_Flag) != 0; }
-
- void writeDataAsByteArray(SkData* data) {
- this->writeByteArray(data->data(), data->size());
- }
-
-protected:
- // A helper function so that each subclass does not have to be a friend of SkFlattenable
- void flattenObject(const SkFlattenable* obj, SkFlattenableWriteBuffer& buffer);
-
- uint32_t fFlags;
-};
-
-#endif
+#endif//SkFlattenableBuffers_DEFINED
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index 25d3bac..37993c0 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -160,15 +160,15 @@
virtual ~SkImageFilter();
/**
- * Constructs a new SkImageFilter read from an SkFlattenableReadBuffer object.
+ * Constructs a new SkImageFilter read from an SkReadBuffer object.
*
* @param inputCount The exact number of inputs expected for this SkImageFilter object.
* -1 can be used if the filter accepts any number of inputs.
- * @param rb SkFlattenableReadBuffer object from which the SkImageFilter is read.
+ * @param rb SkReadBuffer object from which the SkImageFilter is read.
*/
- explicit SkImageFilter(int inputCount, SkFlattenableReadBuffer& rb);
+ explicit SkImageFilter(int inputCount, SkReadBuffer& rb);
- virtual void flatten(SkFlattenableWriteBuffer& wb) const SK_OVERRIDE;
+ virtual void flatten(SkWriteBuffer& wb) const SK_OVERRIDE;
/**
* This is the virtual which should be overridden by the derived class
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index d389d5e..722ff27 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -11,8 +11,8 @@
#include "SkTypes.h"
#include "SkSize.h"
-class SkFlattenableWriteBuffer;
-class SkFlattenableReadBuffer;
+class SkWriteBuffer;
+class SkReadBuffer;
/**
* Describes how to interpret the alpha compoent of a pixel.
@@ -178,8 +178,8 @@
return 0 != memcmp(this, &other, sizeof(other));
}
- void unflatten(SkFlattenableReadBuffer&);
- void flatten(SkFlattenableWriteBuffer&) const;
+ void unflatten(SkReadBuffer&);
+ void flatten(SkWriteBuffer&) const;
size_t getSafeSize(size_t rowBytes) const {
if (0 == fHeight) {
diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h
index 4607fa2..f6a57b3 100644
--- a/include/core/SkMallocPixelRef.h
+++ b/include/core/SkMallocPixelRef.h
@@ -91,12 +91,12 @@
// The ownPixels version of this constructor is deprecated.
SkMallocPixelRef(const SkImageInfo&, void* addr, size_t rb, SkColorTable*,
bool ownPixels);
- SkMallocPixelRef(SkFlattenableReadBuffer& buffer);
+ SkMallocPixelRef(SkReadBuffer& buffer);
virtual ~SkMallocPixelRef();
virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
virtual void onUnlockPixels() SK_OVERRIDE;
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
private:
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 20dc379..b47e034 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -137,7 +137,7 @@
protected:
// empty for now, but lets get our subclass to remember to init us for the future
- SkMaskFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkMaskFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
enum FilterReturn {
kFalse_FilterReturn,
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 00ec29e..abb8599 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -24,8 +24,8 @@
class SkColorFilter;
class SkDescriptor;
struct SkDeviceProperties;
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
struct SkGlyph;
struct SkRect;
class SkGlyphCache;
@@ -72,8 +72,8 @@
return !(a == b);
}
- void flatten(SkFlattenableWriteBuffer&) const;
- void unflatten(SkFlattenableReadBuffer&);
+ void flatten(SkWriteBuffer&) const;
+ void unflatten(SkReadBuffer&);
/** Restores the paint to its initial settings.
*/
diff --git a/include/core/SkPaintOptionsAndroid.h b/include/core/SkPaintOptionsAndroid.h
index f49345f..ab84ec0 100644
--- a/include/core/SkPaintOptionsAndroid.h
+++ b/include/core/SkPaintOptionsAndroid.h
@@ -13,8 +13,8 @@
#include "SkTypes.h"
#include "SkString.h"
-class SkFlattenableReadBuffer;
-class SkFlattenableWriteBuffer;
+class SkReadBuffer;
+class SkWriteBuffer;
/** \class SkLanguage
@@ -80,8 +80,8 @@
fUseFontFallbacks != b.fUseFontFallbacks;
}
- void flatten(SkFlattenableWriteBuffer&) const;
- void unflatten(SkFlattenableReadBuffer&);
+ void flatten(SkWriteBuffer&) const;
+ void unflatten(SkReadBuffer&);
/** Return the paint's language value used for drawing text.
@return the paint's language value used for drawing text.
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
index ed6d93b..3f38f3a 100644
--- a/include/core/SkPathEffect.h
+++ b/include/core/SkPathEffect.h
@@ -109,7 +109,7 @@
SK_DEFINE_FLATTENABLE_TYPE(SkPathEffect)
protected:
- SkPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
// illegal
@@ -131,8 +131,8 @@
virtual ~SkPairPathEffect();
protected:
- SkPairPathEffect(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPairPathEffect(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// these are visible to our subclasses
SkPathEffect* fPE0, *fPE1;
@@ -162,7 +162,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect)
protected:
- SkComposePathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkComposePathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
// illegal
@@ -193,7 +193,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect)
protected:
- SkSumPathEffect(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkSumPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
// illegal
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index d63b66b..82d6835 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -169,8 +169,8 @@
/**
* Function to encode an SkBitmap to an SkData. A function with this
- * signature can be passed to serialize() and SkOrderedWriteBuffer.
- * Returning NULL will tell the SkOrderedWriteBuffer to use
+ * signature can be passed to serialize() and SkWriteBuffer.
+ * Returning NULL will tell the SkWriteBuffer to use
* SkBitmap::flatten() to store the bitmap.
*
* @param pixelRefOffset DEPRECATED -- caller assumes it will return 0.
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h
index 5a9a5a0..439a4ca 100644
--- a/include/core/SkPixelRef.h
+++ b/include/core/SkPixelRef.h
@@ -328,8 +328,8 @@
SkBaseMutex* mutex() const { return fMutex; }
// serialization
- SkPixelRef(SkFlattenableReadBuffer&, SkBaseMutex*);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPixelRef(SkReadBuffer&, SkBaseMutex*);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// only call from constructor. Flags this to always be locked, removing
// the need to grab the mutex and call onLockPixels/onUnlockPixels.
diff --git a/include/core/SkRasterizer.h b/include/core/SkRasterizer.h
index 6e6224e..d916b23 100644
--- a/include/core/SkRasterizer.h
+++ b/include/core/SkRasterizer.h
@@ -33,7 +33,7 @@
SK_DEFINE_FLATTENABLE_TYPE(SkRasterizer)
protected:
- SkRasterizer(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkRasterizer(SkReadBuffer& buffer) : INHERITED(buffer) {}
virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
const SkIRect* clipBounds,
diff --git a/include/core/SkReadBuffer.h b/include/core/SkReadBuffer.h
new file mode 100644
index 0000000..75cc64b
--- /dev/null
+++ b/include/core/SkReadBuffer.h
@@ -0,0 +1,205 @@
+
+/*
+ * 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 SkReadBuffer_DEFINED
+#define SkReadBuffer_DEFINED
+
+#include "SkBitmapHeap.h"
+#include "SkColorFilter.h"
+#include "SkData.h"
+#include "SkDrawLooper.h"
+#include "SkImageFilter.h"
+#include "SkMaskFilter.h"
+#include "SkPath.h"
+#include "SkPathEffect.h"
+#include "SkPicture.h"
+#include "SkPixelRef.h"
+#include "SkRasterizer.h"
+#include "SkReadBuffer.h"
+#include "SkReader32.h"
+#include "SkRefCnt.h"
+#include "SkShader.h"
+#include "SkUnitMapper.h"
+#include "SkWriteBuffer.h"
+#include "SkXfermode.h"
+
+class SkBitmap;
+
+#if defined(SK_DEBUG) && defined(SK_BUILD_FOR_MAC)
+ #define DEBUG_NON_DETERMINISTIC_ASSERT
+#endif
+
+class SkReadBuffer {
+public:
+ SkReadBuffer();
+ SkReadBuffer(const void* data, size_t size);
+ SkReadBuffer(SkStream* stream);
+ virtual ~SkReadBuffer();
+
+ enum Flags {
+ kCrossProcess_Flag = 1 << 0,
+ kScalarIsFloat_Flag = 1 << 1,
+ kPtrIs64Bit_Flag = 1 << 2,
+ kValidation_Flag = 1 << 3,
+ };
+
+ void setFlags(uint32_t flags) { fFlags = flags; }
+ uint32_t getFlags() const { return fFlags; }
+
+ bool isCrossProcess() const {
+ return this->isValidating() || SkToBool(fFlags & kCrossProcess_Flag);
+ }
+ bool isScalarFloat() const { return SkToBool(fFlags & kScalarIsFloat_Flag); }
+ bool isPtr64Bit() const { return SkToBool(fFlags & kPtrIs64Bit_Flag); }
+ bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
+
+ SkReader32* getReader32() { return &fReader; }
+
+ uint32_t size() { return fReader.size(); }
+ uint32_t offset() { return fReader.offset(); }
+ bool eof() { return fReader.eof(); }
+ const void* skip(size_t size) { return fReader.skip(size); }
+
+ // primitives
+ virtual bool readBool();
+ virtual SkColor readColor();
+ virtual SkFixed readFixed();
+ virtual int32_t readInt();
+ virtual SkScalar readScalar();
+ virtual uint32_t readUInt();
+ virtual int32_t read32();
+
+ void* readFunctionPtr() {
+ void* ptr;
+ this->readByteArray(&ptr, sizeof(ptr));
+ return ptr;
+ }
+
+ // strings -- the caller is responsible for freeing the string contents
+ virtual void readString(SkString* string);
+ virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding);
+
+ // common data structures
+ virtual void readPoint(SkPoint* point);
+ SkPoint readPoint() { SkPoint p; this->readPoint(&p); return p; }
+ virtual void readMatrix(SkMatrix* matrix);
+ virtual void readIRect(SkIRect* rect);
+ virtual void readRect(SkRect* rect);
+ virtual void readRegion(SkRegion* region);
+ virtual void readPath(SkPath* path);
+ void readPaint(SkPaint* paint) { paint->unflatten(*this); }
+
+ virtual SkFlattenable* readFlattenable(SkFlattenable::Type);
+ template <typename T> T* readFlattenable() {
+ return (T*) this->readFlattenable(T::GetFlattenableType());
+ }
+ SkColorFilter* readColorFilter() { return this->readFlattenable<SkColorFilter>(); }
+ SkDrawLooper* readDrawLooper() { return this->readFlattenable<SkDrawLooper>(); }
+ SkImageFilter* readImageFilter() { return this->readFlattenable<SkImageFilter>(); }
+ SkMaskFilter* readMaskFilter() { return this->readFlattenable<SkMaskFilter>(); }
+ SkPathEffect* readPathEffect() { return this->readFlattenable<SkPathEffect>(); }
+ SkPixelRef* readPixelRef() { return this->readFlattenable<SkPixelRef>(); }
+ SkRasterizer* readRasterizer() { return this->readFlattenable<SkRasterizer>(); }
+ SkShader* readShader() { return this->readFlattenable<SkShader>(); }
+ SkUnitMapper* readUnitMapper() { return this->readFlattenable<SkUnitMapper>(); }
+ SkXfermode* readXfermode() { return this->readFlattenable<SkXfermode>(); }
+
+
+ // binary data and arrays
+ virtual bool readByteArray(void* value, size_t size);
+ virtual bool readColorArray(SkColor* colors, size_t size);
+ virtual bool readIntArray(int32_t* values, size_t size);
+ virtual bool readPointArray(SkPoint* points, size_t size);
+ virtual bool readScalarArray(SkScalar* values, size_t size);
+
+ SkData* readByteArrayAsData() {
+ size_t len = this->getArrayCount();
+ if (!this->validateAvailable(len)) {
+ return SkData::NewEmpty();
+ }
+ void* buffer = sk_malloc_throw(len);
+ this->readByteArray(buffer, len);
+ return SkData::NewFromMalloc(buffer, len);
+ }
+
+ // helpers to get info about arrays and binary data
+ virtual uint32_t getArrayCount();
+
+ virtual void readBitmap(SkBitmap* bitmap);
+ virtual SkTypeface* readTypeface();
+
+ void setBitmapStorage(SkBitmapHeapReader* bitmapStorage) {
+ SkRefCnt_SafeAssign(fBitmapStorage, bitmapStorage);
+ }
+
+ void setTypefaceArray(SkTypeface* array[], int count) {
+ fTFArray = array;
+ fTFCount = count;
+ }
+
+ /**
+ * Call this with a pre-loaded array of Factories, in the same order as
+ * were created/written by the writer. SkPicture uses this.
+ */
+ void setFactoryPlayback(SkFlattenable::Factory array[], int count) {
+ fFactoryTDArray = NULL;
+ fFactoryArray = array;
+ fFactoryCount = count;
+ }
+
+ /**
+ * Call this with an initially empty array, so the reader can cache each
+ * factory it sees by name. Used by the pipe code in conjunction with
+ * SkWriteBuffer::setNamedFactoryRecorder.
+ */
+ void setFactoryArray(SkTDArray<SkFlattenable::Factory>* array) {
+ fFactoryTDArray = array;
+ fFactoryArray = NULL;
+ fFactoryCount = 0;
+ }
+
+ /**
+ * Provide a function to decode an SkBitmap from encoded data. Only used if the writer
+ * encoded the SkBitmap. If the proper decoder cannot be used, a red bitmap with the
+ * appropriate size will be used.
+ */
+ void setBitmapDecoder(SkPicture::InstallPixelRefProc bitmapDecoder) {
+ fBitmapDecoder = bitmapDecoder;
+ }
+
+ // Default impelementations don't check anything.
+ virtual bool validate(bool isValid) { return true; }
+ virtual bool isValid() const { return true; }
+ virtual bool validateAvailable(size_t size) { return true; }
+
+private:
+ bool readArray(void* value, size_t size, size_t elementSize);
+
+ uint32_t fFlags;
+
+ SkReader32 fReader;
+ void* fMemoryPtr;
+
+ SkBitmapHeapReader* fBitmapStorage;
+ SkTypeface** fTFArray;
+ int fTFCount;
+
+ SkTDArray<SkFlattenable::Factory>* fFactoryTDArray;
+ SkFlattenable::Factory* fFactoryArray;
+ int fFactoryCount;
+
+ SkPicture::InstallPixelRefProc fBitmapDecoder;
+
+#ifdef DEBUG_NON_DETERMINISTIC_ASSERT
+ // Debugging counter to keep track of how many bitmaps we
+ // have decoded.
+ int fDecodedBitmapIndex;
+#endif // DEBUG_NON_DETERMINISTIC_ASSERT
+};
+
+#endif // SkReadBuffer_DEFINED
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index cdb7a2f..108c6b0 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -363,8 +363,8 @@
const SkMatrix& getTotalInverse() const { return fTotalInverse; }
MatrixClass getInverseClass() const { return (MatrixClass)fTotalInverseClass; }
- SkShader(SkFlattenableReadBuffer& );
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkShader(SkReadBuffer& );
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkMatrix fLocalMatrix;
SkMatrix fTotalInverse;
diff --git a/include/core/SkUnitMapper.h b/include/core/SkUnitMapper.h
index 57a8b83..46f6edd 100644
--- a/include/core/SkUnitMapper.h
+++ b/include/core/SkUnitMapper.h
@@ -28,7 +28,7 @@
SK_DEFINE_FLATTENABLE_TYPE(SkUnitMapper)
protected:
- SkUnitMapper(SkFlattenableReadBuffer& rb) : SkFlattenable(rb) {}
+ SkUnitMapper(SkReadBuffer& rb) : SkFlattenable(rb) {}
private:
typedef SkFlattenable INHERITED;
diff --git a/include/core/SkWriteBuffer.h b/include/core/SkWriteBuffer.h
new file mode 100644
index 0000000..ab56f9d
--- /dev/null
+++ b/include/core/SkWriteBuffer.h
@@ -0,0 +1,121 @@
+
+/*
+ * 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
+
+#include "SkBitmapHeap.h"
+#include "SkData.h"
+#include "SkPath.h"
+#include "SkPicture.h"
+#include "SkRefCnt.h"
+#include "SkWriter32.h"
+
+class SkBitmap;
+class SkFactorySet;
+class SkFlattenable;
+class SkNamedFactorySet;
+class SkRefCntSet;
+
+class SkWriteBuffer {
+public:
+ SkWriteBuffer();
+ SkWriteBuffer(void* initialStorage, size_t storageSize);
+ ~SkWriteBuffer();
+
+ enum Flags {
+ kCrossProcess_Flag = 1 << 0,
+ kValidation_Flag = 1 << 1,
+ };
+ void setFlags(uint32_t flags) { fFlags = flags; }
+ uint32_t getFlags() const { return fFlags; }
+
+ bool isValidating() const { return SkToBool(fFlags & kValidation_Flag); }
+ bool isCrossProcess() const {
+ return this->isValidating() || SkToBool(fFlags & kCrossProcess_Flag);
+ }
+
+ SkWriter32* getWriter32() { return &fWriter; }
+ void reset(void* storage = NULL, size_t storageSize = 0) {
+ fWriter.reset(storage, storageSize);
+ }
+
+ uint32_t* reserve(size_t size) { return fWriter.reserve(size); }
+
+ size_t bytesWritten() const { return fWriter.bytesWritten(); }
+
+ void writeByteArray(const void* data, size_t size);
+ void writeDataAsByteArray(SkData* data) { this->writeByteArray(data->data(), data->size()); }
+ void writeBool(bool value);
+ void writeFixed(SkFixed value);
+ void writeScalar(SkScalar value);
+ void writeScalarArray(const SkScalar* value, uint32_t count);
+ void writeInt(int32_t value);
+ void writeIntArray(const int32_t* value, uint32_t count);
+ void writeUInt(uint32_t value);
+ void write32(int32_t value);
+ void writeString(const char* value);
+ void writeEncodedString(const void* value, size_t byteLength, SkPaint::TextEncoding encoding);
+ void writeFunctionPtr(void* ptr) { this->writeByteArray(&ptr, sizeof(ptr)); }
+
+ void writeFlattenable(const SkFlattenable* flattenable);
+ void writeColor(const SkColor& color);
+ 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 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; }
+ 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:
+ uint32_t fFlags;
+ SkFactorySet* fFactorySet;
+ SkNamedFactorySet* fNamedFactorySet;
+ SkWriter32 fWriter;
+
+ SkBitmapHeap* fBitmapHeap;
+ SkRefCntSet* fTFSet;
+
+ SkPicture::EncodeBitmap fBitmapEncoder;
+};
+
+#endif // SkWriteBuffer_DEFINED
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index 3ef2241..31b8081 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -218,7 +218,7 @@
SK_DEFINE_FLATTENABLE_TYPE(SkXfermode)
protected:
- SkXfermode(SkFlattenableReadBuffer& rb) : SkFlattenable(rb) {}
+ SkXfermode(SkReadBuffer& rb) : SkFlattenable(rb) {}
/** The default implementation of xfer32/xfer16/xferA8 in turn call this
method, 1 color at a time (upscaled to a SkPMColor). The default
@@ -264,8 +264,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkProcXfermode)
protected:
- SkProcXfermode(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkProcXfermode(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// allow subclasses to update this after we unflatten
void setProc(SkXfermodeProc proc) {
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h
index 4599276..4ac8f73 100644
--- a/include/effects/Sk1DPathEffect.h
+++ b/include/effects/Sk1DPathEffect.h
@@ -60,8 +60,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect)
protected:
- SkPath1DPathEffect(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPath1DPathEffect(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// overrides from Sk1DPathEffect
virtual SkScalar begin(SkScalar contourLength) const SK_OVERRIDE;
diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h
index ed7f674..859b5cd 100644
--- a/include/effects/Sk2DPathEffect.h
+++ b/include/effects/Sk2DPathEffect.h
@@ -41,8 +41,8 @@
const SkMatrix& getMatrix() const { return fMatrix; }
// protected so that subclasses can call this during unflattening
- Sk2DPathEffect(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ Sk2DPathEffect(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkMatrix fMatrix, fInverse;
@@ -69,9 +69,9 @@
protected:
virtual void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE;
- SkLine2DPathEffect(SkFlattenableReadBuffer&);
+ SkLine2DPathEffect(SkReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkScalar fWidth;
@@ -90,8 +90,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath2DPathEffect)
protected:
- SkPath2DPathEffect(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPath2DPathEffect(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE;
diff --git a/include/effects/SkAvoidXfermode.h b/include/effects/SkAvoidXfermode.h
index 4950b64..afc3fc9 100644
--- a/include/effects/SkAvoidXfermode.h
+++ b/include/effects/SkAvoidXfermode.h
@@ -51,8 +51,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAvoidXfermode)
protected:
- SkAvoidXfermode(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkAvoidXfermode(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkColor fOpColor;
diff --git a/include/effects/SkBicubicImageFilter.h b/include/effects/SkBicubicImageFilter.h
index bd918eb..d321169 100644
--- a/include/effects/SkBicubicImageFilter.h
+++ b/include/effects/SkBicubicImageFilter.h
@@ -35,8 +35,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBicubicImageFilter)
protected:
- SkBicubicImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkBicubicImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h
index ec779ea..e0e241b 100644
--- a/include/effects/SkBitmapSource.h
+++ b/include/effects/SkBitmapSource.h
@@ -20,8 +20,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)
protected:
- explicit SkBitmapSource(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkBitmapSource(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h
index 013e807..46b154d 100644
--- a/include/effects/SkBlurDrawLooper.h
+++ b/include/effects/SkBlurDrawLooper.h
@@ -51,8 +51,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurDrawLooper)
protected:
- SkBlurDrawLooper(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkBlurDrawLooper(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkMaskFilter* fBlur;
diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h
index d0d2446..1d51f9a 100644
--- a/include/effects/SkBlurImageFilter.h
+++ b/include/effects/SkBlurImageFilter.h
@@ -22,8 +22,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilter)
protected:
- explicit SkBlurImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkBlurImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h
index c4ac6b2..c04e418 100755
--- a/include/effects/SkColorFilterImageFilter.h
+++ b/include/effects/SkColorFilterImageFilter.h
@@ -22,8 +22,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter)
protected:
- SkColorFilterImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkColorFilterImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index ca7c086..a4144e1 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -35,8 +35,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter)
protected:
- SkColorMatrixFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkColorMatrixFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkColorMatrix fMatrix;
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 45f530b..744647d 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -18,7 +18,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
protected:
- explicit SkComposeImageFilter(SkFlattenableReadBuffer& buffer);
+ explicit SkComposeImageFilter(SkReadBuffer& buffer);
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h
index 704b7fb..dcb7c9f 100644
--- a/include/effects/SkCornerPathEffect.h
+++ b/include/effects/SkCornerPathEffect.h
@@ -29,8 +29,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCornerPathEffect)
protected:
- SkCornerPathEffect(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkCornerPathEffect(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkScalar fRadius;
diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h
index 4e83f45..818e073 100644
--- a/include/effects/SkDashPathEffect.h
+++ b/include/effects/SkDashPathEffect.h
@@ -49,11 +49,11 @@
virtual Factory getFactory() const SK_OVERRIDE;
- static SkFlattenable* CreateProc(SkFlattenableReadBuffer&);
+ static SkFlattenable* CreateProc(SkReadBuffer&);
protected:
- SkDashPathEffect(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkDashPathEffect(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkScalar* fIntervals;
diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h
index 999ea04..60eb852 100644
--- a/include/effects/SkDiscretePathEffect.h
+++ b/include/effects/SkDiscretePathEffect.h
@@ -28,8 +28,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect)
protected:
- SkDiscretePathEffect(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkDiscretePathEffect(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkScalar fSegLength, fPerterb;
diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h
index d82a40a..ba7e259 100644
--- a/include/effects/SkDisplacementMapEffect.h
+++ b/include/effects/SkDisplacementMapEffect.h
@@ -46,8 +46,8 @@
#endif
protected:
- explicit SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
ChannelSelectorType fXChannelSelector;
diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h
index 0c66272..14a7893 100644
--- a/include/effects/SkDropShadowImageFilter.h
+++ b/include/effects/SkDropShadowImageFilter.h
@@ -17,8 +17,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
protected:
- explicit SkDropShadowImageFilter(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkDropShadowImageFilter(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& source, const SkMatrix&, SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
private:
diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h
index 7210b78..263c5e0 100644
--- a/include/effects/SkEmbossMaskFilter.h
+++ b/include/effects/SkEmbossMaskFilter.h
@@ -39,8 +39,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter)
protected:
- SkEmbossMaskFilter(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkEmbossMaskFilter(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
Light fLight;
diff --git a/include/effects/SkKernel33MaskFilter.h b/include/effects/SkKernel33MaskFilter.h
index 3404b73..bcd9b26 100644
--- a/include/effects/SkKernel33MaskFilter.h
+++ b/include/effects/SkKernel33MaskFilter.h
@@ -24,8 +24,8 @@
SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;)
protected:
- SkKernel33ProcMaskFilter(SkFlattenableReadBuffer& rb);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkKernel33ProcMaskFilter(SkReadBuffer& rb);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
int fPercent256;
@@ -53,8 +53,8 @@
int fKernel[3][3];
int fShift;
- SkKernel33MaskFilter(SkFlattenableReadBuffer& rb);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkKernel33MaskFilter(SkReadBuffer& rb);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
typedef SkKernel33ProcMaskFilter INHERITED;
};
diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h
index adf07a9..6955192 100644
--- a/include/effects/SkLayerDrawLooper.h
+++ b/include/effects/SkLayerDrawLooper.h
@@ -110,8 +110,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerDrawLooper)
protected:
- SkLayerDrawLooper(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkLayerDrawLooper(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
struct Rec {
diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h
index 65d1be0..be81a2b 100644
--- a/include/effects/SkLayerRasterizer.h
+++ b/include/effects/SkLayerRasterizer.h
@@ -35,8 +35,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerRasterizer)
protected:
- SkLayerRasterizer(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkLayerRasterizer(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// override from SkRasterizer
virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
diff --git a/include/effects/SkLerpXfermode.h b/include/effects/SkLerpXfermode.h
index 6151f3d..b6cc93f 100644
--- a/include/effects/SkLerpXfermode.h
+++ b/include/effects/SkLerpXfermode.h
@@ -32,8 +32,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode)
protected:
- SkLerpXfermode(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkLerpXfermode(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkLerpXfermode(unsigned scale256);
diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h
index b3fb7d0..4a76a9c 100644
--- a/include/effects/SkLightingImageFilter.h
+++ b/include/effects/SkLightingImageFilter.h
@@ -74,8 +74,8 @@
SkScalar surfaceScale,
SkImageFilter* input,
const CropRect* cropRect = NULL);
- explicit SkLightingImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkLightingImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
const SkLight* light() const { return fLight; }
SkScalar surfaceScale() const { return fSurfaceScale; }
diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h
index a0c08bb..6c57f7c 100644
--- a/include/effects/SkLumaColorFilter.h
+++ b/include/effects/SkLumaColorFilter.h
@@ -35,8 +35,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter)
protected:
- SkLumaColorFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkLumaColorFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkLumaColorFilter();
diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h
index b5a79fa..222abd1 100644
--- a/include/effects/SkMagnifierImageFilter.h
+++ b/include/effects/SkMagnifierImageFilter.h
@@ -19,8 +19,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMagnifierImageFilter)
protected:
- explicit SkMagnifierImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkMagnifierImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h
index d3cf8e3..8da556e 100644
--- a/include/effects/SkMatrixConvolutionImageFilter.h
+++ b/include/effects/SkMatrixConvolutionImageFilter.h
@@ -64,8 +64,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter)
protected:
- SkMatrixConvolutionImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkMatrixConvolutionImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index ad464d3..bd9ab6c 100755
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -25,8 +25,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
protected:
- SkMergeImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkMergeImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index d44d0e2..0335908 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -32,8 +32,8 @@
bool filterImageGeneric(Proc procX, Proc procY,
Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* offset);
- SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkMorphologyImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
#if SK_SUPPORT_GPU
virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src,
@@ -65,7 +65,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
protected:
- SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
typedef SkMorphologyImageFilter INHERITED;
@@ -88,7 +88,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
protected:
- SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {}
private:
typedef SkMorphologyImageFilter INHERITED;
diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h
index f156415..9237111 100644
--- a/include/effects/SkOffsetImageFilter.h
+++ b/include/effects/SkOffsetImageFilter.h
@@ -21,8 +21,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter)
protected:
- SkOffsetImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkOffsetImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
index 22cb892..dd89c70 100644
--- a/include/effects/SkPerlinNoiseShader.h
+++ b/include/effects/SkPerlinNoiseShader.h
@@ -73,8 +73,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader)
protected:
- SkPerlinNoiseShader(SkFlattenableReadBuffer&);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPerlinNoiseShader(SkReadBuffer&);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX,
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 98d72d9..ccda85d 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -28,8 +28,8 @@
protected:
virtual ~SkPictureImageFilter();
- explicit SkPictureImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkPictureImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h
index 5411b12..9472d94 100644
--- a/include/effects/SkPixelXorXfermode.h
+++ b/include/effects/SkPixelXorXfermode.h
@@ -23,8 +23,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode)
protected:
- SkPixelXorXfermode(SkFlattenableReadBuffer& rb);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkPixelXorXfermode(SkReadBuffer& rb);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
// override from SkXfermode
virtual SkPMColor xferColor(SkPMColor src, SkPMColor dst) const;
diff --git a/include/effects/SkRectShaderImageFilter.h b/include/effects/SkRectShaderImageFilter.h
index ea97478..28d98cc 100644
--- a/include/effects/SkRectShaderImageFilter.h
+++ b/include/effects/SkRectShaderImageFilter.h
@@ -34,8 +34,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShaderImageFilter)
protected:
- SkRectShaderImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkRectShaderImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkResizeImageFilter.h b/include/effects/SkResizeImageFilter.h
index d638555..e2747e7 100644
--- a/include/effects/SkResizeImageFilter.h
+++ b/include/effects/SkResizeImageFilter.h
@@ -36,8 +36,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkResizeImageFilter)
protected:
- SkResizeImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkResizeImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkStippleMaskFilter.h b/include/effects/SkStippleMaskFilter.h
index 8f6d20d..ee32ae1 100644
--- a/include/effects/SkStippleMaskFilter.h
+++ b/include/effects/SkStippleMaskFilter.h
@@ -31,7 +31,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter);
protected:
- SkStippleMaskFilter(SkFlattenableReadBuffer& buffer)
+ SkStippleMaskFilter(SkReadBuffer& buffer)
: SkMaskFilter(buffer) {
}
diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h
index ac33266..1c2bbd7 100644
--- a/include/effects/SkTableMaskFilter.h
+++ b/include/effects/SkTableMaskFilter.h
@@ -51,8 +51,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter)
protected:
- SkTableMaskFilter(SkFlattenableReadBuffer& rb);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkTableMaskFilter(SkReadBuffer& rb);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
uint8_t fTable[256];
diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h
index e848ff1..66ef5b1 100755
--- a/include/effects/SkTestImageFilters.h
+++ b/include/effects/SkTestImageFilters.h
@@ -12,8 +12,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDownSampleImageFilter)
protected:
- SkDownSampleImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkDownSampleImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h
index bee8a68..095b976 100644
--- a/include/effects/SkTileImageFilter.h
+++ b/include/effects/SkTileImageFilter.h
@@ -28,9 +28,9 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter)
protected:
- explicit SkTileImageFilter(SkFlattenableReadBuffer& buffer);
+ explicit SkTileImageFilter(SkReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE;
+ virtual void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE;
private:
SkRect fSrcRect;
diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h
index bee9a02..2b3f998 100644
--- a/include/effects/SkTransparentShader.h
+++ b/include/effects/SkTransparentShader.h
@@ -29,7 +29,7 @@
const SkBitmap* fDevice;
uint8_t fAlpha;
- SkTransparentShader(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
+ SkTransparentShader(SkReadBuffer& buffer) : INHERITED(buffer) {}
typedef SkShader INHERITED;
};
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index 6343c4b..e2724c3 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -40,8 +40,8 @@
#endif
protected:
- explicit SkXfermodeImageFilter(SkFlattenableReadBuffer& buffer);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ explicit SkXfermodeImageFilter(SkReadBuffer& buffer);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
SkXfermode* fMode;
diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h
index 36f95e6..ec14456 100644
--- a/include/images/SkImageRef.h
+++ b/include/images/SkImageRef.h
@@ -76,8 +76,8 @@
// override this in your subclass to clean up when we're unlocking pixels
virtual void onUnlockPixels() SK_OVERRIDE {}
- SkImageRef(SkFlattenableReadBuffer&, SkBaseMutex* mutex = NULL);
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkImageRef(SkReadBuffer&, SkBaseMutex* mutex = NULL);
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
SkBitmap fBitmap;
diff --git a/include/images/SkImageRef_GlobalPool.h b/include/images/SkImageRef_GlobalPool.h
index caaf248..7b99a6e 100644
--- a/include/images/SkImageRef_GlobalPool.h
+++ b/include/images/SkImageRef_GlobalPool.h
@@ -53,7 +53,7 @@
virtual void onUnlockPixels();
- SkImageRef_GlobalPool(SkFlattenableReadBuffer&);
+ SkImageRef_GlobalPool(SkReadBuffer&);
private:
typedef SkImageRef INHERITED;
diff --git a/include/utils/SkUnitMappers.h b/include/utils/SkUnitMappers.h
index 509e2d6..3833e69 100644
--- a/include/utils/SkUnitMappers.h
+++ b/include/utils/SkUnitMappers.h
@@ -23,8 +23,8 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscreteMapper)
protected:
- SkDiscreteMapper(SkFlattenableReadBuffer& );
- virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
+ SkDiscreteMapper(SkReadBuffer& );
+ virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
private:
int fSegments;
@@ -45,7 +45,7 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCosineMapper)
protected:
- SkCosineMapper(SkFlattenableReadBuffer&);
+ SkCosineMapper(SkReadBuffer&);
private: