diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/core/SkValidatingReadBuffer.h | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/core/SkValidatingReadBuffer.h')
-rw-r--r-- | src/core/SkValidatingReadBuffer.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h index 916bed4d75..bcdcba5de4 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(); - const void* skip(size_t size) SK_OVERRIDE; + const void* skip(size_t size) override; // primitives - 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; + bool readBool() override; + SkColor readColor() override; + SkFixed readFixed() override; + int32_t readInt() override; + SkScalar readScalar() override; + uint32_t readUInt() override; + int32_t read32() override; // strings -- the caller is responsible for freeing the string contents - void readString(SkString* string) SK_OVERRIDE; - void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) SK_OVERRIDE; + void readString(SkString* string) override; + void* readEncodedString(size_t* length, SkPaint::TextEncoding encoding) override; // common data structures - 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; + SkFlattenable* readFlattenable(SkFlattenable::Type type) override; + void skipFlattenable() override; + void readPoint(SkPoint* point) override; + void readMatrix(SkMatrix* matrix) override; + void readIRect(SkIRect* rect) override; + void readRect(SkRect* rect) override; + void readRegion(SkRegion* region) override; + void readPath(SkPath* path) override; // binary data and arrays - 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; + bool readByteArray(void* value, size_t size) override; + bool readColorArray(SkColor* colors, size_t size) override; + bool readIntArray(int32_t* values, size_t size) override; + bool readPointArray(SkPoint* points, size_t size) override; + bool readScalarArray(SkScalar* values, size_t size) override; // helpers to get info about arrays and binary data - uint32_t getArrayCount() SK_OVERRIDE; + uint32_t getArrayCount() override; // TODO: Implement this (securely) when needed - SkTypeface* readTypeface() SK_OVERRIDE; + SkTypeface* readTypeface() override; - bool validate(bool isValid) SK_OVERRIDE; - bool isValid() const SK_OVERRIDE; + bool validate(bool isValid) override; + bool isValid() const override; - bool validateAvailable(size_t size) SK_OVERRIDE; + bool validateAvailable(size_t size) override; private: bool readArray(void* value, size_t size, size_t elementSize); |