Index: src/core/SkValidatingReadBuffer.h |
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h |
index 5cf3abed68f20fe2a4c9147cb61052abdf2c9555..916bed4d75b98b5be1eb6afabcf97b45104a6cb6 100644 |
--- a/src/core/SkValidatingReadBuffer.h |
+++ b/src/core/SkValidatingReadBuffer.h |
@@ -23,48 +23,48 @@ public: |
SkValidatingReadBuffer(const void* data, size_t size); |
virtual ~SkValidatingReadBuffer(); |
- virtual const void* skip(size_t size) SK_OVERRIDE; |
+ const void* skip(size_t size) SK_OVERRIDE; |
// primitives |
- virtual bool readBool() SK_OVERRIDE; |
- virtual SkColor readColor() SK_OVERRIDE; |
- virtual SkFixed readFixed() SK_OVERRIDE; |
- virtual int32_t readInt() SK_OVERRIDE; |
- virtual SkScalar readScalar() SK_OVERRIDE; |
- virtual uint32_t readUInt() SK_OVERRIDE; |
- virtual int32_t read32() SK_OVERRIDE; |
+ bool readBool() SK_OVERRIDE; |
+ SkColor readColor() SK_OVERRIDE; |
+ SkFixed readFixed() SK_OVERRIDE; |
+ int32_t readInt() SK_OVERRIDE; |
+ SkScalar readScalar() SK_OVERRIDE; |
+ uint32_t readUInt() SK_OVERRIDE; |
+ int32_t read32() SK_OVERRIDE; |
// strings -- the caller is responsible for freeing the string contents |
- virtual void readString(SkString* string) SK_OVERRIDE; |
- virtual void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; |
+ void readString(SkString* string) SK_OVERRIDE; |
+ void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; |
// common data structures |
- virtual SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; |
- virtual void skipFlattenable() SK_OVERRIDE; |
- virtual void readPoint(SkPoint* point) SK_OVERRIDE; |
- virtual void readMatrix(SkMatrix* matrix) SK_OVERRIDE; |
- virtual void readIRect(SkIRect* rect) SK_OVERRIDE; |
- virtual void readRect(SkRect* rect) SK_OVERRIDE; |
- virtual void readRegion(SkRegion* region) SK_OVERRIDE; |
- virtual void readPath(SkPath* path) SK_OVERRIDE; |
+ SkFlattenable* readFlattenable(SkFlattenable::Type type) SK_OVERRIDE; |
+ void skipFlattenable() SK_OVERRIDE; |
+ void readPoint(SkPoint* point) SK_OVERRIDE; |
+ void readMatrix(SkMatrix* matrix) SK_OVERRIDE; |
+ void readIRect(SkIRect* rect) SK_OVERRIDE; |
+ void readRect(SkRect* rect) SK_OVERRIDE; |
+ void readRegion(SkRegion* region) SK_OVERRIDE; |
+ void readPath(SkPath* path) SK_OVERRIDE; |
// binary data and arrays |
- virtual bool readByteArray(void* value, size_t size) SK_OVERRIDE; |
- virtual bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; |
- virtual bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; |
- virtual bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; |
- virtual bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; |
+ bool readByteArray(void* value, size_t size) SK_OVERRIDE; |
+ bool readColorArray(SkColor* colors, size_t size) SK_OVERRIDE; |
+ bool readIntArray(int32_t* values, size_t size) SK_OVERRIDE; |
+ bool readPointArray(SkPoint* points, size_t size) SK_OVERRIDE; |
+ bool readScalarArray(SkScalar* values, size_t size) SK_OVERRIDE; |
// helpers to get info about arrays and binary data |
- virtual uint32_t getArrayCount() SK_OVERRIDE; |
+ uint32_t getArrayCount() SK_OVERRIDE; |
// TODO: Implement this (securely) when needed |
- virtual SkTypeface* readTypeface() SK_OVERRIDE; |
+ SkTypeface* readTypeface() SK_OVERRIDE; |
- virtual bool validate(bool isValid) SK_OVERRIDE; |
- virtual bool isValid() const SK_OVERRIDE; |
+ bool validate(bool isValid) SK_OVERRIDE; |
+ bool isValid() const SK_OVERRIDE; |
- virtual bool validateAvailable(size_t size) SK_OVERRIDE; |
+ bool validateAvailable(size_t size) SK_OVERRIDE; |
private: |
bool readArray(void* value, size_t size, size_t elementSize); |