| Index: src/core/SkValidatingReadBuffer.h
|
| diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h
|
| index accf5d75f9a33dc8eceaa941f24d50f98a107346..e1af3b3732c851a647f448482fd0a44c1e2add3f 100644
|
| --- a/src/core/SkValidatingReadBuffer.h
|
| +++ b/src/core/SkValidatingReadBuffer.h
|
| @@ -49,7 +49,6 @@ public:
|
| virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE;
|
|
|
| // common data structures
|
| - virtual SkFlattenable* readFlattenable() SK_OVERRIDE;
|
| virtual void readPoint(SkPoint* point) SK_OVERRIDE;
|
| virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE;
|
| virtual void readIRect(SkIRect* rect) SK_OVERRIDE;
|
| @@ -109,6 +108,10 @@ public:
|
| fBitmapDecoder = bitmapDecoder;
|
| }
|
|
|
| +protected:
|
| + // Use readFlattenableT to enforce a type check on the flattenable read
|
| + virtual SkFlattenable* readFlattenable() SK_OVERRIDE;
|
| +
|
| private:
|
| void setMemory(const void* data, size_t size);
|
|
|
|
|