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 /include | |
| 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 'include')
70 files changed, 436 insertions, 462 deletions
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h index 7337006769..1d9c9179e0 100644 --- a/include/codec/SkCodec.h +++ b/include/codec/SkCodec.h @@ -101,7 +101,7 @@ protected: * reveals that the image is actually opaque. */ #ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO - bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { + bool onGetInfo(SkImageInfo* info) override { *info = fInfo; return true; } diff --git a/include/core/SkBBHFactory.h b/include/core/SkBBHFactory.h index 57baf6beb9..f0c49f1f4f 100644 --- a/include/core/SkBBHFactory.h +++ b/include/core/SkBBHFactory.h @@ -23,7 +23,7 @@ public: class SK_API SkRTreeFactory : public SkBBHFactory { public: - SkBBoxHierarchy* operator()(const SkRect& bounds) const SK_OVERRIDE; + SkBBoxHierarchy* operator()(const SkRect& bounds) const override; private: typedef SkBBHFactory INHERITED; }; diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 059a8d734c..dbaca621af 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -694,7 +694,7 @@ public: */ class HeapAllocator : public Allocator { public: - bool allocPixelRef(SkBitmap*, SkColorTable*) SK_OVERRIDE; + bool allocPixelRef(SkBitmap*, SkColorTable*) override; }; class RLEPixels { diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h index caff6857da..9d8c4c5c3e 100644 --- a/include/core/SkBitmapDevice.h +++ b/include/core/SkBitmapDevice.h @@ -35,25 +35,25 @@ public: return Create(info, NULL); } - SkImageInfo imageInfo() const SK_OVERRIDE; + SkImageInfo imageInfo() const override; protected: - bool onShouldDisableLCD(const SkPaint&) const SK_OVERRIDE; + bool onShouldDisableLCD(const SkPaint&) const override; /** These are called inside the per-device-layer loop for each draw call. When these are called, we have already applied any saveLayer operations, and are handling any looping from the paint, and any effects from the DrawFilter. */ - void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; + void drawPaint(const SkDraw&, const SkPaint& paint) override; virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, - const SkPoint[], const SkPaint& paint) SK_OVERRIDE; + const SkPoint[], const SkPaint& paint) override; virtual void drawRect(const SkDraw&, const SkRect& r, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawOval(const SkDraw&, const SkRect& oval, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawRRect(const SkDraw&, const SkRRect& rr, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; /** * If pathIsMutable, then the implementation is allowed to cast path to a @@ -69,11 +69,11 @@ protected: virtual void drawPath(const SkDraw&, const SkPath& path, const SkPaint& paint, const SkMatrix* prePathMatrix = NULL, - bool pathIsMutable = false) SK_OVERRIDE; + bool pathIsMutable = false) override; virtual void drawBitmap(const SkDraw&, const SkBitmap& bitmap, - const SkMatrix& matrix, const SkPaint& paint) SK_OVERRIDE; + const SkMatrix& matrix, const SkPaint& paint) override; virtual void drawSprite(const SkDraw&, const SkBitmap& bitmap, - int x, int y, const SkPaint& paint) SK_OVERRIDE; + int x, int y, const SkPaint& paint) override; /** * The default impl. will create a bitmap-shader from the bitmap, @@ -82,23 +82,23 @@ protected: virtual void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect* srcOrNull, const SkRect& dst, const SkPaint& paint, - SkCanvas::DrawBitmapRectFlags flags) SK_OVERRIDE; + SkCanvas::DrawBitmapRectFlags flags) override; /** * Does not handle text decoration. * Decorations (underline and stike-thru) will be handled by SkCanvas. */ virtual void drawText(const SkDraw&, const void* text, size_t len, - SkScalar x, SkScalar y, const SkPaint& paint) SK_OVERRIDE; + SkScalar x, SkScalar y, const SkPaint& paint) override; virtual void drawPosText(const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, - const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE; + const SkPoint& offset, const SkPaint& paint) override; virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode, int vertexCount, const SkPoint verts[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint& paint) SK_OVERRIDE; - virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) SK_OVERRIDE; + const SkPaint& paint) override; + virtual void drawDevice(const SkDraw&, SkBaseDevice*, int x, int y, const SkPaint&) override; /////////////////////////////////////////////////////////////////////////// @@ -107,7 +107,7 @@ protected: altered. The config/width/height/rowbytes must remain unchanged. @return the device contents as a bitmap */ - const SkBitmap& onAccessBitmap() SK_OVERRIDE; + const SkBitmap& onAccessBitmap() override; SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); } // just for subclasses, to assign a custom pixelref @@ -116,15 +116,15 @@ protected: return pr; } - bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; - bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; - void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) SK_OVERRIDE; + bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) override; + bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) override; + void* onAccessPixels(SkImageInfo* info, size_t* rowBytes) override; /** Called when this device is installed into a Canvas. Balanced by a call to unlockPixels() when the device is removed from a Canvas. */ - void lockPixels() SK_OVERRIDE; - void unlockPixels() SK_OVERRIDE; + void lockPixels() override; + void unlockPixels() override; private: friend class SkCanvas; @@ -139,14 +139,14 @@ private: // used to change the backend's pixels (and possibly config/rowbytes) // but cannot change the width/height, so there should be no change to // any clip information. - void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE; + void replaceBitmapBackendForRasterSurface(const SkBitmap&) override; - SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE; + SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override; - SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE; - const void* peekPixels(SkImageInfo*, size_t* rowBytes) SK_OVERRIDE; + SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override; + const void* peekPixels(SkImageInfo*, size_t* rowBytes) override; - SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE; + SkImageFilter::Cache* getImageFilterCache() override; SkBitmap fBitmap; diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index 8e0d93f7e8..dd10447a04 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -34,7 +34,7 @@ public: SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL); virtual ~SkComposeShader(); - size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const override; class ComposeShaderContext : public SkShader::Context { public: @@ -48,7 +48,7 @@ public: virtual ~ComposeShaderContext(); - void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) override; private: SkShader::Context* fShaderContextA; @@ -62,15 +62,15 @@ public: SkShader* getShaderB() { return fShaderB; } #endif - bool asACompose(ComposeRec* rec) const SK_OVERRIDE; + bool asACompose(ComposeRec* rec) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) protected: SkComposeShader(SkReadBuffer& ); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; - Context* onCreateContext(const ContextRec&, void*) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; + Context* onCreateContext(const ContextRec&, void*) const override; private: SkShader* fShaderA; diff --git a/include/core/SkDrawPictureCallback.h b/include/core/SkDrawPictureCallback.h index ea30f59a24..ab6ca0aa7a 100644 --- a/include/core/SkDrawPictureCallback.h +++ b/include/core/SkDrawPictureCallback.h @@ -27,7 +27,7 @@ class SK_API SkDrawPictureCallback : public SkPicture::AbortCallback { public: virtual bool abortDrawing() = 0; - bool abort() SK_OVERRIDE { return this->abortDrawing(); } + bool abort() override { return this->abortDrawing(); } }; #endif diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h index 1868176924..74f8717b68 100644 --- a/include/core/SkFlattenable.h +++ b/include/core/SkFlattenable.h @@ -49,7 +49,7 @@ class SkWriteBuffer; static SkFlattenable* CreateProc(SkReadBuffer&); \ friend class SkPrivateEffectInitializer; \ public: \ - Factory getFactory() const SK_OVERRIDE { return CreateProc; } + Factory getFactory() const override { return CreateProc; } /** For SkFlattenable derived objects with a valid type This macro should only be used in base class objects in core diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 40bd38a949..dab46ae716 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -266,7 +266,7 @@ protected: */ explicit SkImageFilter(int inputCount, SkReadBuffer& rb); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; /** * This is the virtual which should be overridden by the derived class diff --git a/include/core/SkMallocPixelRef.h b/include/core/SkMallocPixelRef.h index 4cb187597e..1cc9c4eb81 100644 --- a/include/core/SkMallocPixelRef.h +++ b/include/core/SkMallocPixelRef.h @@ -84,7 +84,7 @@ public: public: virtual SkPixelRef* create(const SkImageInfo&, size_t rowBytes, - SkColorTable*) SK_OVERRIDE; + SkColorTable*) override; }; protected: @@ -93,9 +93,9 @@ protected: bool ownPixels); virtual ~SkMallocPixelRef(); - bool onNewLockPixels(LockRec*) SK_OVERRIDE; - void onUnlockPixels() SK_OVERRIDE; - size_t getAllocatedSizeInBytes() const SK_OVERRIDE; + bool onNewLockPixels(LockRec*) override; + void onUnlockPixels() override; + size_t getAllocatedSizeInBytes() const override; private: void* fStorage; diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index 7e2d1ae6a4..09070bd331 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -163,7 +163,7 @@ public: protected: SkPairPathEffect(SkPathEffect* pe0, SkPathEffect* pe1); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; // these are visible to our subclasses SkPathEffect* fPE0, *fPE1; @@ -191,13 +191,13 @@ public: } virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif protected: @@ -228,13 +228,13 @@ public: } virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif protected: diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index d08f68a1d9..22427d2016 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -284,32 +284,6 @@ ////////////////////////////////////////////////////////////////////// -#ifndef SK_OVERRIDE -# if defined(_MSC_VER) -# define SK_OVERRIDE override -# elif defined(__clang__) - // Using __attribute__((override)) on clang does not appear to always work. - // Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no - // push/pop here so all users of SK_OVERRIDE ignore the warning too. This is like passing - // -Wno-c++11-extensions, except that GCC won't die (because it won't see this pragma). -# pragma clang diagnostic ignored "-Wc++11-extensions" -# -# if __has_feature(cxx_override_control) -# define SK_OVERRIDE override -# elif defined(__has_extension) && __has_extension(cxx_override_control) -# define SK_OVERRIDE override -# endif - // if GCC >= 4.7 -# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) -# define SK_OVERRIDE override -# endif -# ifndef SK_OVERRIDE -# define SK_OVERRIDE -# endif -#endif - -////////////////////////////////////////////////////////////////////// - #if !defined(SK_UNUSED) # define SK_UNUSED SK_ATTRIBUTE(unused) #endif diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 5efd46d595..91d431f11b 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -476,7 +476,7 @@ public: SK_DEFINE_FLATTENABLE_TYPE(SkShader) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; bool computeTotalInverse(const ContextRec&, SkMatrix* totalInverse) const; diff --git a/include/core/SkStream.h b/include/core/SkStream.h index 9e6c261cbe..829ece6496 100644 --- a/include/core/SkStream.h +++ b/include/core/SkStream.h @@ -130,39 +130,39 @@ public: /** SkStreamRewindable is a SkStream for which rewind and duplicate are required. */ class SK_API SkStreamRewindable : public SkStream { public: - bool rewind() SK_OVERRIDE = 0; - SkStreamRewindable* duplicate() const SK_OVERRIDE = 0; + bool rewind() override = 0; + SkStreamRewindable* duplicate() const override = 0; }; /** SkStreamSeekable is a SkStreamRewindable for which position, seek, move, and fork are required. */ class SK_API SkStreamSeekable : public SkStreamRewindable { public: - SkStreamSeekable* duplicate() const SK_OVERRIDE = 0; + SkStreamSeekable* duplicate() const override = 0; - bool hasPosition() const SK_OVERRIDE { return true; } - size_t getPosition() const SK_OVERRIDE = 0; - bool seek(size_t position) SK_OVERRIDE = 0; - bool move(long offset) SK_OVERRIDE = 0; - SkStreamSeekable* fork() const SK_OVERRIDE = 0; + bool hasPosition() const override { return true; } + size_t getPosition() const override = 0; + bool seek(size_t position) override = 0; + bool move(long offset) override = 0; + SkStreamSeekable* fork() const override = 0; }; /** SkStreamAsset is a SkStreamSeekable for which getLength is required. */ class SK_API SkStreamAsset : public SkStreamSeekable { public: - SkStreamAsset* duplicate() const SK_OVERRIDE = 0; - SkStreamAsset* fork() const SK_OVERRIDE = 0; + SkStreamAsset* duplicate() const override = 0; + SkStreamAsset* fork() const override = 0; - bool hasLength() const SK_OVERRIDE { return true; } - size_t getLength() const SK_OVERRIDE = 0; + bool hasLength() const override { return true; } + size_t getLength() const override = 0; }; /** SkStreamMemory is a SkStreamAsset for which getMemoryBase is required. */ class SK_API SkStreamMemory : public SkStreamAsset { public: - SkStreamMemory* duplicate() const SK_OVERRIDE = 0; - SkStreamMemory* fork() const SK_OVERRIDE = 0; + SkStreamMemory* duplicate() const override = 0; + SkStreamMemory* fork() const override = 0; - const void* getMemoryBase() SK_OVERRIDE = 0; + const void* getMemoryBase() override = 0; }; class SK_API SkWStream : SkNoncopyable { @@ -245,20 +245,20 @@ public: */ void setPath(const char path[]); - size_t read(void* buffer, size_t size) SK_OVERRIDE; - bool isAtEnd() const SK_OVERRIDE; + size_t read(void* buffer, size_t size) override; + bool isAtEnd() const override; - bool rewind() SK_OVERRIDE; - SkStreamAsset* duplicate() const SK_OVERRIDE; + bool rewind() override; + SkStreamAsset* duplicate() const override; - size_t getPosition() const SK_OVERRIDE; - bool seek(size_t position) SK_OVERRIDE; - bool move(long offset) SK_OVERRIDE; - SkStreamAsset* fork() const SK_OVERRIDE; + size_t getPosition() const override; + bool seek(size_t position) override; + bool move(long offset) override; + SkStreamAsset* fork() const override; - size_t getLength() const SK_OVERRIDE; + size_t getLength() const override; - const void* getMemoryBase() SK_OVERRIDE; + const void* getMemoryBase() override; private: SkFILE* fFILE; @@ -317,20 +317,20 @@ public: const void* getAtPos(); size_t peek() const { return fOffset; } - size_t read(void* buffer, size_t size) SK_OVERRIDE; - bool isAtEnd() const SK_OVERRIDE; + size_t read(void* buffer, size_t size) override; + bool isAtEnd() const override; - bool rewind() SK_OVERRIDE; - SkMemoryStream* duplicate() const SK_OVERRIDE; + bool rewind() override; + SkMemoryStream* duplicate() const override; - size_t getPosition() const SK_OVERRIDE; - bool seek(size_t position) SK_OVERRIDE; - bool move(long offset) SK_OVERRIDE; - SkMemoryStream* fork() const SK_OVERRIDE; + size_t getPosition() const override; + bool seek(size_t position) override; + bool move(long offset) override; + SkMemoryStream* fork() const override; - size_t getLength() const SK_OVERRIDE; + size_t getLength() const override; - const void* getMemoryBase() SK_OVERRIDE; + const void* getMemoryBase() override; private: SkData* fData; @@ -352,9 +352,9 @@ public: */ bool isValid() const { return fFILE != NULL; } - bool write(const void* buffer, size_t size) SK_OVERRIDE; - void flush() SK_OVERRIDE; - size_t bytesWritten() const SK_OVERRIDE; + bool write(const void* buffer, size_t size) override; + void flush() override; + size_t bytesWritten() const override; private: SkFILE* fFILE; @@ -367,8 +367,8 @@ public: SK_DECLARE_INST_COUNT(SkMemoryWStream) SkMemoryWStream(void* buffer, size_t size); - bool write(const void* buffer, size_t size) SK_OVERRIDE; - size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) override; + size_t bytesWritten() const override { return fBytesWritten; } private: char* fBuffer; @@ -385,8 +385,8 @@ public: SkDynamicMemoryWStream(); virtual ~SkDynamicMemoryWStream(); - bool write(const void* buffer, size_t size) SK_OVERRIDE; - size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) override; + size_t bytesWritten() const override { return fBytesWritten; } // random access write // modifies stream and returns true if offset + size is less than or equal to getOffset() bool write(const void* buffer, size_t offset, size_t size); @@ -432,9 +432,9 @@ public: SK_DECLARE_INST_COUNT(SkDebugWStream) // overrides - bool write(const void* buffer, size_t size) SK_OVERRIDE; - void newline() SK_OVERRIDE; - size_t bytesWritten() const SK_OVERRIDE { return fBytesWritten; } + bool write(const void* buffer, size_t size) override; + void newline() override; + size_t bytesWritten() const override { return fBytesWritten; } private: size_t fBytesWritten; diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 39923c59b7..3f4bc2cf34 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -73,7 +73,7 @@ static inline void sk_bzero(void* buffer, size_t size) { /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_OVERRIDE_GLOBAL_NEW +#ifdef override_GLOBAL_NEW #include <new> inline void* operator new(size_t size) { @@ -138,7 +138,7 @@ inline void operator delete(void* p) { #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0; - #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const SK_OVERRIDE; + #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override; #endif template <bool> diff --git a/include/core/SkWeakRefCnt.h b/include/core/SkWeakRefCnt.h index 3eb8ea5ca5..91795f7adb 100644 --- a/include/core/SkWeakRefCnt.h +++ b/include/core/SkWeakRefCnt.h @@ -147,7 +147,7 @@ private: on the object and releases the implicit weak reference held collectively by the strong references. */ - void internal_dispose() const SK_OVERRIDE { + void internal_dispose() const override { weak_dispose(); weak_unref(); } diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h index 10dab81183..9efb6f3dc8 100644 --- a/include/device/xps/SkXPSDevice.h +++ b/include/device/xps/SkXPSDevice.h @@ -71,54 +71,54 @@ public: virtual bool endPortfolio(); protected: - void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; + void drawPaint(const SkDraw&, const SkPaint& paint) override; virtual void drawPoints( const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawRect( const SkDraw&, const SkRect& r, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawRRect( const SkDraw&, const SkRRect&, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawPath( const SkDraw&, const SkPath& platonicPath, const SkPaint& paint, const SkMatrix* prePathMatrix, - bool pathIsMutable) SK_OVERRIDE; + bool pathIsMutable) override; virtual void drawBitmap( const SkDraw&, const SkBitmap& bitmap, const SkMatrix& matrix, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawSprite( const SkDraw&, const SkBitmap& bitmap, int x, int y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawText( const SkDraw&, const void* text, size_t len, SkScalar x, SkScalar y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawPosText( const SkDraw&, const void* text, size_t len, const SkScalar pos[], int scalarsPerPos, - const SkPoint& offset, const SkPaint& paint) SK_OVERRIDE; + const SkPoint& offset, const SkPaint& paint) override; virtual void drawVertices( const SkDraw&, @@ -127,13 +127,13 @@ protected: const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void drawDevice( const SkDraw&, SkBaseDevice* device, int x, int y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; private: class TypefaceUse : ::SkNoncopyable { @@ -309,7 +309,7 @@ private: const SkVector& ppuScale, IXpsOMPath* shadedPath); - SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE; + SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override; // Disable the default copy and assign implementation. SkXPSDevice(const SkXPSDevice&); diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index e5a3b5c160..6b3ec6d673 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -17,7 +17,7 @@ class SkPathMeasure; class SK_API Sk1DPathEffect : public SkPathEffect { public: virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; protected: /** Called at the start of each contour, returns the initial offset @@ -32,7 +32,7 @@ protected: virtual SkScalar next(SkPath* dst, SkScalar dist, SkPathMeasure&) const = 0; #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif private: @@ -62,18 +62,18 @@ public: } virtual bool filterPath(SkPath*, const SkPath&, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPath1DPathEffect) protected: SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkScalar phase, Style); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; // overrides from Sk1DPathEffect - SkScalar begin(SkScalar contourLength) const SK_OVERRIDE; - SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const SK_OVERRIDE; + SkScalar begin(SkScalar contourLength) const override; + SkScalar next(SkPath*, SkScalar, SkPathMeasure&) const override; private: SkPath fPath; // copied from constructor diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index 7971ef431c..7fbf94b14d 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -14,7 +14,7 @@ class SK_API Sk2DPathEffect : public SkPathEffect { public: - bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + bool filterPath(SkPath*, const SkPath&, SkStrokeRec*, const SkRect*) const override; protected: /** New virtual, to be overridden by subclasses. @@ -37,7 +37,7 @@ protected: // protected so that subclasses can call this during unflattening explicit Sk2DPathEffect(const SkMatrix& mat); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; SK_TO_STRING_OVERRIDE() @@ -60,7 +60,7 @@ public: } virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLine2DPathEffect) @@ -68,9 +68,9 @@ public: protected: SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix) : Sk2DPathEffect(matrix), fWidth(width) {} - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; - void nextSpan(int u, int v, int ucount, SkPath*) const SK_OVERRIDE; + void nextSpan(int u, int v, int ucount, SkPath*) const override; private: SkScalar fWidth; @@ -93,9 +93,9 @@ public: protected: SkPath2DPathEffect(const SkMatrix&, const SkPath&); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; - void next(const SkPoint&, int u, int v, SkPath*) const SK_OVERRIDE; + void next(const SkPoint&, int u, int v, SkPath*) const override; private: SkPath fPath; diff --git a/include/effects/SkArcToPathEffect.h b/include/effects/SkArcToPathEffect.h index 7a96cd72ce..6ae7e36485 100644 --- a/include/effects/SkArcToPathEffect.h +++ b/include/effects/SkArcToPathEffect.h @@ -22,14 +22,14 @@ public: return SkNEW_ARGS(SkArcToPathEffect, (radius)); } - bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkArcToPathEffect) protected: explicit SkArcToPathEffect(SkScalar radius); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkScalar fRadius; diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h index 327ff6477e..cd43e8f61f 100644 --- a/include/effects/SkBitmapSource.h +++ b/include/effects/SkBitmapSource.h @@ -20,7 +20,7 @@ public: const SkRect& dstRect) { return SkNEW_ARGS(SkBitmapSource, (bitmap, srcRect, dstRect)); } - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource) @@ -28,10 +28,10 @@ public: protected: explicit SkBitmapSource(const SkBitmap& bitmap); SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; private: SkBitmap fBitmap; diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index 5e6b9df502..26bcd52252 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -42,9 +42,9 @@ public: virtual ~SkBlurDrawLooper(); - SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; + SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const override; - size_t contextSize() const SK_OVERRIDE { return sizeof(BlurDrawLooperContext); } + size_t contextSize() const override { return sizeof(BlurDrawLooperContext); } SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurDrawLooper) @@ -53,9 +53,9 @@ protected: SkBlurDrawLooper(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, uint32_t flags); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; - bool asABlurShadow(BlurShadowRec*) const SK_OVERRIDE; + bool asABlurShadow(BlurShadowRec*) const override; private: SkMaskFilter* fBlur; @@ -74,7 +74,7 @@ private: public: explicit BlurDrawLooperContext(const SkBlurDrawLooper* looper); - bool next(SkCanvas* canvas, SkPaint* paint) SK_OVERRIDE; + bool next(SkCanvas* canvas, SkPaint* paint) override; private: const SkBlurDrawLooper* fLooper; diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h index 6f4537fed7..ec29c8e237 100644 --- a/include/effects/SkBlurImageFilter.h +++ b/include/effects/SkBlurImageFilter.h @@ -20,7 +20,7 @@ public: return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect)); } - void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilter) @@ -30,16 +30,16 @@ protected: SkScalar sigmaY, SkImageFilter* input, const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, - SkIRect* dst) const SK_OVERRIDE; + SkIRect* dst) const override; - bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const override { return true; } virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; private: SkSize fSigma; diff --git a/include/effects/SkColorCubeFilter.h b/include/effects/SkColorCubeFilter.h index 4500a0c292..4999bc5777 100644 --- a/include/effects/SkColorCubeFilter.h +++ b/include/effects/SkColorCubeFilter.h @@ -21,11 +21,11 @@ public: */ static SkColorFilter* Create(SkData* cubeData, int cubeDimension); - void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; - uint32_t getFlags() const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; + uint32_t getFlags() const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_TO_STRING_OVERRIDE() @@ -33,7 +33,7 @@ public: protected: SkColorCubeFilter(SkData* cubeData, int cubeDimension); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: /** The cache is initialized on-demand when getProcessingLuts is called. diff --git a/include/effects/SkColorFilterImageFilter.h b/include/effects/SkColorFilterImageFilter.h index 7f775dbd68..0076a87c20 100644 --- a/include/effects/SkColorFilterImageFilter.h +++ b/include/effects/SkColorFilterImageFilter.h @@ -23,12 +23,12 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterImageFilter) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; - bool onIsColorFilterNode(SkColorFilter**) const SK_OVERRIDE; + bool onIsColorFilterNode(SkColorFilter**) const override; private: SkColorFilterImageFilter(SkColorFilter* cf, diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index 4cb24bad5d..27a2be835b 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -20,13 +20,13 @@ public: return SkNEW_ARGS(SkColorMatrixFilter, (array)); } - void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; - uint32_t getFlags() const SK_OVERRIDE; - bool asColorMatrix(SkScalar matrix[20]) const SK_OVERRIDE; - SkColorFilter* newComposed(const SkColorFilter*) const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; + uint32_t getFlags() const override; + bool asColorMatrix(SkScalar matrix[20]) const override; + SkColorFilter* newComposed(const SkColorFilter*) const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; #endif struct State { @@ -41,7 +41,7 @@ public: protected: explicit SkColorMatrixFilter(const SkColorMatrix&); explicit SkColorMatrixFilter(const SkScalar array[20]); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkColorMatrix fMatrix; diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h index 361ca2b8fe..e3dc1ffb23 100644 --- a/include/effects/SkComposeImageFilter.h +++ b/include/effects/SkComposeImageFilter.h @@ -24,7 +24,7 @@ public: SkImageFilter* inputs[2] = { outer, inner }; return SkNEW_ARGS(SkComposeImageFilter, (inputs)); } - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) @@ -35,8 +35,8 @@ protected: SkASSERT(inputs[1]); } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override; private: typedef SkImageFilter INHERITED; diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index 636de400d3..19357903ec 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -26,18 +26,18 @@ public: virtual ~SkCornerPathEffect(); virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkCornerPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif protected: explicit SkCornerPathEffect(SkScalar radius); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkScalar fRadius; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index dcb7577404..0fd00d70af 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -43,24 +43,24 @@ public: virtual ~SkDashPathEffect(); virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; virtual bool asPoints(PointData* results, const SkPath& src, const SkStrokeRec&, const SkMatrix&, - const SkRect*) const SK_OVERRIDE; + const SkRect*) const override; - DashType asADash(DashInfo* info) const SK_OVERRIDE; + DashType asADash(DashInfo* info) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDashPathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif protected: SkDashPathEffect(const SkScalar intervals[], int count, SkScalar phase); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkScalar* fIntervals; diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index ea44d654cf..d05d181de0 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -37,20 +37,20 @@ public: } virtual bool filterPath(SkPath* dst, const SkPath& src, - SkStrokeRec*, const SkRect*) const SK_OVERRIDE; + SkStrokeRec*, const SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDiscretePathEffect) #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK - bool exposedInAndroidJavaAPI() const SK_OVERRIDE { return true; } + bool exposedInAndroidJavaAPI() const override { return true; } #endif protected: SkDiscretePathEffect(SkScalar segLength, SkScalar deviation, uint32_t seedAssist); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkScalar fSegLength, fPerterb; diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h index b3fa8d5f00..9513a54f15 100644 --- a/include/effects/SkDisplacementMapEffect.h +++ b/include/effects/SkDisplacementMapEffect.h @@ -35,16 +35,16 @@ public: const SkBitmap& src, const Context& ctx, SkBitmap* dst, - SkIPoint* offset) const SK_OVERRIDE; - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + SkIPoint* offset) const override; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, - SkIRect* dst) const SK_OVERRIDE; + SkIRect* dst) const override; #if SK_SUPPORT_GPU - bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const override { return true; } virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif SK_TO_STRING_OVERRIDE() @@ -54,7 +54,7 @@ protected: ChannelSelectorType yChannelSelector, SkScalar scale, SkImageFilter* inputs[2], const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: ChannelSelectorType fXChannelSelector; diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h index 7dea4dfa48..3ff3d8044e 100644 --- a/include/effects/SkDropShadowImageFilter.h +++ b/include/effects/SkDropShadowImageFilter.h @@ -29,17 +29,17 @@ public: shadowMode, input, cropRect)); } - void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE; + void computeFastBounds(const SkRect&, SkRect*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter) protected: SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor, ShadowMode shadowMode, SkImageFilter* input, const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; - bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; + bool onFilterImage(Proxy*, const SkBitmap& source, const Context&, SkBitmap* result, SkIPoint* loc) const override; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, - SkIRect* dst) const SK_OVERRIDE; + SkIRect* dst) const override; private: SkScalar fDx, fDy, fSigmaX, fSigmaY; diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index 3fa15fd5c3..41dfa2a66c 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -27,17 +27,17 @@ public: // overrides from SkMaskFilter // This method is not exported to java. - SkMask::Format getFormat() const SK_OVERRIDE; + SkMask::Format getFormat() const override; // This method is not exported to java. virtual bool filterMask(SkMask* dst, const SkMask& src, const SkMatrix&, - SkIPoint* margin) const SK_OVERRIDE; + SkIPoint* margin) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkEmbossMaskFilter) protected: SkEmbossMaskFilter(SkScalar blurSigma, const Light& light); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: Light fLight; diff --git a/include/effects/SkLayerDrawLooper.h b/include/effects/SkLayerDrawLooper.h index 9aac01e50d..d93d08ad7e 100644 --- a/include/effects/SkLayerDrawLooper.h +++ b/include/effects/SkLayerDrawLooper.h @@ -73,21 +73,21 @@ public: LayerInfo(); }; - SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVERRIDE; + SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const override; - size_t contextSize() const SK_OVERRIDE { return sizeof(LayerDrawLooperContext); } + size_t contextSize() const override { return sizeof(LayerDrawLooperContext); } - bool asABlurShadow(BlurShadowRec* rec) const SK_OVERRIDE; + bool asABlurShadow(BlurShadowRec* rec) const override; SK_TO_STRING_OVERRIDE() - Factory getFactory() const SK_OVERRIDE { return CreateProc; } + Factory getFactory() const override { return CreateProc; } static SkFlattenable* CreateProc(SkReadBuffer& buffer); protected: SkLayerDrawLooper(); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: struct Rec { @@ -105,7 +105,7 @@ private: explicit LayerDrawLooperContext(const SkLayerDrawLooper* looper); protected: - bool next(SkCanvas*, SkPaint* paint) SK_OVERRIDE; + bool next(SkCanvas*, SkPaint* paint) override; private: Rec* fCurrRec; diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h index 6ea873cdc9..c6ac1de363 100644 --- a/include/effects/SkLayerRasterizer.h +++ b/include/effects/SkLayerRasterizer.h @@ -69,12 +69,12 @@ public: protected: SkLayerRasterizer(); SkLayerRasterizer(SkDeque* layers); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; // override from SkRasterizer virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix, const SkIRect* clipBounds, - SkMask* mask, SkMask::CreateMode mode) const SK_OVERRIDE; + SkMask* mask, SkMask::CreateMode mode) const override; private: const SkDeque* const fLayers; diff --git a/include/effects/SkLerpXfermode.h b/include/effects/SkLerpXfermode.h index 4fcc06b554..8ba42302bf 100644 --- a/include/effects/SkLerpXfermode.h +++ b/include/effects/SkLerpXfermode.h @@ -22,17 +22,17 @@ public: // overrides from SkXfermode virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, - const SkAlpha aa[]) const SK_OVERRIDE; + const SkAlpha aa[]) const override; virtual void xfer16(uint16_t dst[], const SkPMColor src[], int count, - const SkAlpha aa[]) const SK_OVERRIDE; + const SkAlpha aa[]) const override; virtual void xferA8(SkAlpha dst[], const SkPMColor src[], int count, - const SkAlpha aa[]) const SK_OVERRIDE; + const SkAlpha aa[]) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLerpXfermode) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkLerpXfermode(unsigned scale256); diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h index e0f78a8d38..e5048eeac7 100644 --- a/include/effects/SkLightingImageFilter.h +++ b/include/effects/SkLightingImageFilter.h @@ -74,7 +74,7 @@ protected: SkScalar surfaceScale, SkImageFilter* input, const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; const SkLight* light() const { return fLight.get(); } SkScalar surfaceScale() const { return fSurfaceScale; } diff --git a/include/effects/SkLumaColorFilter.h b/include/effects/SkLumaColorFilter.h index c970e8c115..4e8ac798e6 100644 --- a/include/effects/SkLumaColorFilter.h +++ b/include/effects/SkLumaColorFilter.h @@ -25,17 +25,17 @@ class SK_API SkLumaColorFilter : public SkColorFilter { public: static SkColorFilter* Create(); - void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const SK_OVERRIDE; + void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override; #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLumaColorFilter) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkLumaColorFilter(); diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index a9cc66a2ae..6df95b233a 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -21,13 +21,13 @@ public: protected: SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&, - const SkIRect& bounds) const SK_OVERRIDE; + const SkIRect& bounds) const override; #endif private: diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index ddb421f011..3bbfc4f09b 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -75,16 +75,16 @@ protected: bool convolveAlpha, SkImageFilter* input, const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override; #if SK_SUPPORT_GPU virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&, - const SkIRect& bounds) const SK_OVERRIDE; + const SkIRect& bounds) const override; #endif private: diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 52ff9d7776..5bb6826b6b 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -36,10 +36,10 @@ protected: SkMergeImageFilter(SkImageFilter* filters[], int count, const SkXfermode::Mode modes[], const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; private: uint8_t* fModes; // SkXfermode::Mode diff --git a/include/effects/SkModeColorFilter.h b/include/effects/SkModeColorFilter.h index 6d0d3ccaa0..a2cb841699 100644 --- a/include/effects/SkModeColorFilter.h +++ b/include/effects/SkModeColorFilter.h @@ -25,12 +25,12 @@ public: SkXfermode::Mode getMode() const { return fMode; } SkPMColor getPMColor() const { return fPMColor; } - bool asColorMode(SkColor*, SkXfermode::Mode*) const SK_OVERRIDE; - uint32_t getFlags() const SK_OVERRIDE; - void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const SK_OVERRIDE; + bool asColorMode(SkColor*, SkXfermode::Mode*) const override; + uint32_t getFlags() const override; + void filterSpan(const SkPMColor shader[], int count, SkPMColor result[]) const override; #ifndef SK_IGNORE_TO_STRING - void toString(SkString* str) const SK_OVERRIDE { + void toString(SkString* str) const override { str->append("SkModeColorFilter: color: 0x"); str->appendHex(fColor); str->append(" mode: "); @@ -39,12 +39,12 @@ public: #endif #if SK_SUPPORT_GPU - bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const SK_OVERRIDE; + bool asFragmentProcessors(GrContext*, SkTDArray<GrFragmentProcessor*>*) const override; #endif SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkModeColorFilter) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkColor fColor; diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index c5c5c7401e..7d409e8753 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -15,8 +15,8 @@ class SK_API SkMorphologyImageFilter : public SkImageFilter { public: - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; - bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; + bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const override; /** * All morphology procs have the same signature: src is the source buffer, dst the @@ -34,9 +34,9 @@ protected: bool filterImageGeneric(Proc procX, Proc procY, Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const; - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; #if SK_SUPPORT_GPU - bool canFilterImageGPU() const SK_OVERRIDE { return true; } + bool canFilterImageGPU() const override { return true; } bool filterImageGPUGeneric(bool dilate, Proxy* proxy, const SkBitmap& src, const Context& ctm, SkBitmap* result, SkIPoint* offset) const; @@ -61,10 +61,10 @@ public: } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif SK_TO_STRING_OVERRIDE() @@ -89,10 +89,10 @@ public: } virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif SK_TO_STRING_OVERRIDE() diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h index 818869171a..17c9627f83 100644 --- a/include/effects/SkOffsetImageFilter.h +++ b/include/effects/SkOffsetImageFilter.h @@ -22,17 +22,17 @@ public: } return SkNEW_ARGS(SkOffsetImageFilter, (dx, dy, input, cropRect)); } - void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; + void computeFastBounds(const SkRect& src, SkRect* dst) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter) protected: SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input, const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; - bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; + bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override; private: SkVector fOffset; diff --git a/include/effects/SkPaintFlagsDrawFilter.h b/include/effects/SkPaintFlagsDrawFilter.h index 0004057e3f..10dd3c4d69 100644 --- a/include/effects/SkPaintFlagsDrawFilter.h +++ b/include/effects/SkPaintFlagsDrawFilter.h @@ -14,7 +14,7 @@ class SK_API SkPaintFlagsDrawFilter : public SkDrawFilter { public: SkPaintFlagsDrawFilter(uint32_t clearFlags, uint32_t setFlags); - bool filter(SkPaint*, Type) SK_OVERRIDE; + bool filter(SkPaint*, Type) override; private: uint16_t fClearFlags; // user specified diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h index b318ef1cd0..fe1c9c5728 100644 --- a/include/effects/SkPerlinNoiseShader.h +++ b/include/effects/SkPerlinNoiseShader.h @@ -72,15 +72,15 @@ public: } - size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const override; class PerlinNoiseShaderContext : public SkShader::Context { public: PerlinNoiseShaderContext(const SkPerlinNoiseShader& shader, const ContextRec&); virtual ~PerlinNoiseShaderContext(); - void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - void shadeSpan16(int x, int y, uint16_t[], int count) SK_OVERRIDE; + void shadeSpan(int x, int y, SkPMColor[], int count) override; + void shadeSpan16(int x, int y, uint16_t[], int count) override; private: SkPMColor shade(const SkPoint& point, StitchData& stitchData) const; @@ -98,14 +98,14 @@ public: virtual bool asFragmentProcessor(GrContext* context, const SkPaint&, const SkMatrix& viewM, const SkMatrix*, GrColor*, - GrFragmentProcessor**) const SK_OVERRIDE; + GrFragmentProcessor**) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPerlinNoiseShader) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; - Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; + Context* onCreateContext(const ContextRec&, void* storage) const override; private: SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, SkScalar baseFrequencyX, diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h index 21d25c4693..d62f03f8a3 100644 --- a/include/effects/SkPictureImageFilter.h +++ b/include/effects/SkPictureImageFilter.h @@ -69,9 +69,9 @@ protected: * SkReadBuffer::setBitmapDecoder() before calling this constructor. * @param SkReadBuffer Serialized picture data. */ - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; private: diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h index ccc61458cb..3e6fa8415a 100644 --- a/include/effects/SkPixelXorXfermode.h +++ b/include/effects/SkPixelXorXfermode.h @@ -26,10 +26,10 @@ public: protected: explicit SkPixelXorXfermode(SkColor opColor) : fOpColor(opColor) {} - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; // override from SkXfermode - SkPMColor xferColor(SkPMColor src, SkPMColor dst) const SK_OVERRIDE; + SkPMColor xferColor(SkPMColor src, SkPMColor dst) const override; private: SkColor fOpColor; diff --git a/include/effects/SkRectShaderImageFilter.h b/include/effects/SkRectShaderImageFilter.h index 6228736fa1..64b42c701e 100644 --- a/include/effects/SkRectShaderImageFilter.h +++ b/include/effects/SkRectShaderImageFilter.h @@ -35,10 +35,10 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkRectShaderImageFilter) protected: - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; private: SkRectShaderImageFilter(SkShader* s, const CropRect* rect); diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h index 444ca019b4..6084ec4061 100644 --- a/include/effects/SkTableMaskFilter.h +++ b/include/effects/SkTableMaskFilter.h @@ -45,9 +45,9 @@ public: return SkNEW_ARGS(SkTableMaskFilter, (table)); } - SkMask::Format getFormat() const SK_OVERRIDE; + SkMask::Format getFormat() const override; virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, - SkIPoint*) const SK_OVERRIDE; + SkIPoint*) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter) @@ -55,7 +55,7 @@ public: protected: SkTableMaskFilter(); explicit SkTableMaskFilter(const uint8_t table[256]); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: uint8_t fTable[256]; diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h index 5e375aea72..5c6661d662 100644 --- a/include/effects/SkTestImageFilters.h +++ b/include/effects/SkTestImageFilters.h @@ -24,10 +24,10 @@ public: protected: SkDownSampleImageFilter(SkScalar scale, SkImageFilter* input) : INHERITED(1, &input), fScale(scale) {} - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* loc) const override; private: SkScalar fScale; diff --git a/include/effects/SkTileImageFilter.h b/include/effects/SkTileImageFilter.h index 95b4c75282..a010205121 100644 --- a/include/effects/SkTileImageFilter.h +++ b/include/effects/SkTileImageFilter.h @@ -23,9 +23,9 @@ public: SkImageFilter* input); virtual bool onFilterImage(Proxy* proxy, const SkBitmap& src, const Context& ctx, - SkBitmap* dst, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* dst, SkIPoint* offset) const override; virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, - SkIRect* dst) const SK_OVERRIDE; + SkIRect* dst) const override; SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTileImageFilter) @@ -34,7 +34,7 @@ protected: SkTileImageFilter(const SkRect& srcRect, const SkRect& dstRect, SkImageFilter* input) : INHERITED(1, &input, NULL), fSrcRect(srcRect), fDstRect(dstRect) {} - void flatten(SkWriteBuffer& buffer) const SK_OVERRIDE; + void flatten(SkWriteBuffer& buffer) const override; private: SkRect fSrcRect; diff --git a/include/effects/SkTransparentShader.h b/include/effects/SkTransparentShader.h index 254338c579..11aa086fa4 100644 --- a/include/effects/SkTransparentShader.h +++ b/include/effects/SkTransparentShader.h @@ -14,16 +14,16 @@ class SK_API SkTransparentShader : public SkShader { public: SkTransparentShader() {} - size_t contextSize() const SK_OVERRIDE; + size_t contextSize() const override; class TransparentShaderContext : public SkShader::Context { public: TransparentShaderContext(const SkTransparentShader& shader, const ContextRec&); virtual ~TransparentShaderContext(); - uint32_t getFlags() const SK_OVERRIDE; - void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; - void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; + uint32_t getFlags() const override; + void shadeSpan(int x, int y, SkPMColor[], int count) override; + void shadeSpan16(int x, int y, uint16_t span[], int count) override; private: const SkBitmap* fDevice; @@ -35,10 +35,10 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader) protected: - Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE; + Context* onCreateContext(const ContextRec&, void* storage) const override; // we don't need to flatten anything at all - void flatten(SkWriteBuffer&) const SK_OVERRIDE {} + void flatten(SkWriteBuffer&) const override {} private: typedef SkShader INHERITED; diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 66df053ba7..2115ee44dd 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -37,17 +37,17 @@ public: const SkBitmap& src, const Context& ctx, SkBitmap* dst, - SkIPoint* offset) const SK_OVERRIDE; + SkIPoint* offset) const override; #if SK_SUPPORT_GPU - bool canFilterImageGPU() const SK_OVERRIDE; + bool canFilterImageGPU() const override; virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, - SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE; + SkBitmap* result, SkIPoint* offset) const override; #endif protected: SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* inputs[2], const CropRect* cropRect); - void flatten(SkWriteBuffer&) const SK_OVERRIDE; + void flatten(SkWriteBuffer&) const override; private: SkXfermode* fMode; diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index 40e006aa8a..ae420cea6c 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -26,8 +26,8 @@ public: SK_DECLARE_INST_COUNT(GrRenderTarget) // GrSurface overrides - GrRenderTarget* asRenderTarget() SK_OVERRIDE { return this; } - const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return this; } + GrRenderTarget* asRenderTarget() override { return this; } + const GrRenderTarget* asRenderTarget() const override { return this; } // GrRenderTarget /** @@ -101,8 +101,8 @@ protected: } // override of GrResource - void onAbandon() SK_OVERRIDE; - void onRelease() SK_OVERRIDE; + void onAbandon() override; + void onRelease() override; private: // Checked when this object is asked to attach a stencil buffer. diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h index ccf958098a..d565f2f9a7 100644 --- a/include/gpu/GrTexture.h +++ b/include/gpu/GrTexture.h @@ -18,8 +18,8 @@ class GrTexturePriv; class GrTexture : virtual public GrSurface { public: - GrTexture* asTexture() SK_OVERRIDE { return this; } - const GrTexture* asTexture() const SK_OVERRIDE { return this; } + GrTexture* asTexture() override { return this; } + const GrTexture* asTexture() const override { return this; } /** * Return the native ID or handle to the texture, depending on the @@ -50,7 +50,7 @@ protected: void validateDesc() const; private: - size_t onGpuMemorySize() const SK_OVERRIDE; + size_t onGpuMemorySize() const override; void dirtyMipMaps(bool mipMapsDirty); enum MipMapsStatus { diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h index 4eab59c7a6..eae19dbbe6 100644 --- a/include/gpu/SkGrPixelRef.h +++ b/include/gpu/SkGrPixelRef.h @@ -25,9 +25,9 @@ public: virtual ~SkROLockPixelsPixelRef(); protected: - bool onNewLockPixels(LockRec*) SK_OVERRIDE; - void onUnlockPixels() SK_OVERRIDE; - bool onLockPixelsAreWritable() const SK_OVERRIDE; // return false; + bool onNewLockPixels(LockRec*) override; + void onUnlockPixels() override; + bool onLockPixelsAreWritable() const override; // return false; private: SkBitmap fBitmap; @@ -47,13 +47,13 @@ public: virtual ~SkGrPixelRef(); // override from SkPixelRef - GrTexture* getTexture() SK_OVERRIDE; + GrTexture* getTexture() override; protected: // overrides from SkPixelRef - bool onReadPixels(SkBitmap* dst, const SkIRect* subset) SK_OVERRIDE; + bool onReadPixels(SkBitmap* dst, const SkIRect* subset) override; virtual SkPixelRef* deepCopy(SkColorType, SkColorProfileType, - const SkIRect* subset) SK_OVERRIDE; + const SkIRect* subset) override; private: GrSurface* fSurface; diff --git a/include/gpu/effects/GrCoverageSetOpXP.h b/include/gpu/effects/GrCoverageSetOpXP.h index 9435b845d4..64002d5b97 100644 --- a/include/gpu/effects/GrCoverageSetOpXP.h +++ b/include/gpu/effects/GrCoverageSetOpXP.h @@ -24,14 +24,14 @@ public: static GrXPFactory* Create(SkRegion::Op regionOp, bool invertCoverage = false); bool supportsRGBCoverage(GrColor /*knownColor*/, - uint32_t /*knownColorFlags*/) const SK_OVERRIDE { + uint32_t /*knownColorFlags*/) const override { return true; } - bool canTweakAlphaForCoverage() const SK_OVERRIDE { return false; } + bool canTweakAlphaForCoverage() const override { return false; } void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput*) const SK_OVERRIDE; + GrXPFactory::InvariantOutput*) const override; private: GrCoverageSetOpXPFactory(SkRegion::Op regionOp, bool invertCoverage); @@ -39,15 +39,15 @@ private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& /*caps*/, const GrProcOptInfo& /*colorPOI*/, - const GrProcOptInfo& /*coveragePOI*/) const SK_OVERRIDE { + const GrProcOptInfo& /*coveragePOI*/) const override { return false; } - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { const GrCoverageSetOpXPFactory& xpf = xpfBase.cast<GrCoverageSetOpXPFactory>(); return fRegionOp == xpf.fRegionOp; } diff --git a/include/gpu/effects/GrPorterDuffXferProcessor.h b/include/gpu/effects/GrPorterDuffXferProcessor.h index 3bcdf0edff..65d7a723f6 100644 --- a/include/gpu/effects/GrPorterDuffXferProcessor.h +++ b/include/gpu/effects/GrPorterDuffXferProcessor.h @@ -18,12 +18,12 @@ class GrPorterDuffXPFactory : public GrXPFactory { public: static GrXPFactory* Create(SkXfermode::Mode mode); - bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const SK_OVERRIDE; + bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const override; - bool canTweakAlphaForCoverage() const SK_OVERRIDE; + bool canTweakAlphaForCoverage() const override; void getInvariantOutput(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - GrXPFactory::InvariantOutput*) const SK_OVERRIDE; + GrXPFactory::InvariantOutput*) const override; private: GrPorterDuffXPFactory(GrBlendCoeff src, GrBlendCoeff dst); @@ -31,13 +31,13 @@ private: GrXferProcessor* onCreateXferProcessor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, - const GrDeviceCoordTexture* dstCopy) const SK_OVERRIDE; + const GrDeviceCoordTexture* dstCopy) const override; bool willReadDstColor(const GrDrawTargetCaps& caps, const GrProcOptInfo& colorPOI, - const GrProcOptInfo& coveragePOI) const SK_OVERRIDE; + const GrProcOptInfo& coveragePOI) const override; - bool onIsEqual(const GrXPFactory& xpfBase) const SK_OVERRIDE { + bool onIsEqual(const GrXPFactory& xpfBase) const override { const GrPorterDuffXPFactory& xpf = xpfBase.cast<GrPorterDuffXPFactory>(); return (fSrcCoeff == xpf.fSrcCoeff && fDstCoeff == xpf.fDstCoeff); } diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h index 57456c2f51..6ca7bf5624 100644 --- a/include/gpu/gl/SkGLContext.h +++ b/include/gpu/gl/SkGLContext.h @@ -19,7 +19,7 @@ class SK_API SkGLContext : public SkRefCnt { public: SK_DECLARE_INST_COUNT(SkGLContext) - ~SkGLContext() SK_OVERRIDE; + ~SkGLContext() override; bool isValid() const { return NULL != gl(); } diff --git a/include/gpu/gl/SkNullGLContext.h b/include/gpu/gl/SkNullGLContext.h index 82b96a9752..ca71ddeb0e 100644 --- a/include/gpu/gl/SkNullGLContext.h +++ b/include/gpu/gl/SkNullGLContext.h @@ -12,9 +12,9 @@ class SK_API SkNullGLContext : public SkGLContext { public: - ~SkNullGLContext() SK_OVERRIDE; - void makeCurrent() const SK_OVERRIDE; - void swapBuffers() const SK_OVERRIDE {}; + ~SkNullGLContext() override; + void makeCurrent() const override; + void swapBuffers() const override {}; static SkNullGLContext* Create(GrGLStandard); diff --git a/include/gpu/gl/angle/SkANGLEGLContext.h b/include/gpu/gl/angle/SkANGLEGLContext.h index 6705248f25..f54f29ecba 100644 --- a/include/gpu/gl/angle/SkANGLEGLContext.h +++ b/include/gpu/gl/angle/SkANGLEGLContext.h @@ -14,9 +14,9 @@ class SkANGLEGLContext : public SkGLContext { public: - ~SkANGLEGLContext() SK_OVERRIDE; - void makeCurrent() const SK_OVERRIDE; - void swapBuffers() const SK_OVERRIDE; + ~SkANGLEGLContext() override; + void makeCurrent() const override; + void swapBuffers() const override; static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGL_GrGLStandard == forcedGpuAPI) { diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 1ab2750739..0977eea26a 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -30,30 +30,30 @@ public: { } protected: - int onCountFamilies() const SK_OVERRIDE; - void onGetFamilyName(int index, SkString* familyName) const SK_OVERRIDE; - SkFontStyleSet* onCreateStyleSet(int index) const SK_OVERRIDE; + int onCountFamilies() const override; + void onGetFamilyName(int index, SkString* familyName) const override; + SkFontStyleSet* onCreateStyleSet(int index) const override; - SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVERRIDE; + SkFontStyleSet* onMatchFamily(const char familyName[]) const override; virtual SkTypeface* onMatchFamilyStyle(const char familyName[], - const SkFontStyle& fontStyle) const SK_OVERRIDE; + const SkFontStyle& fontStyle) const override; virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&, const char* bcp47[], int bcp47Count, - SkUnichar character) const SK_OVERRIDE; + SkUnichar character) const override; virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, - const SkFontStyle& fontStyle) const SK_OVERRIDE; + const SkFontStyle& fontStyle) const override; - SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const SK_OVERRIDE; - SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE; - SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE; + SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override; + SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override; + SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], - unsigned styleBits) const SK_OVERRIDE; + unsigned styleBits) const override; private: SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const; diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h index d3ab73f675..ac8556f539 100644 --- a/include/utils/SkDeferredCanvas.h +++ b/include/utils/SkDeferredCanvas.h @@ -143,61 +143,61 @@ public: */ void silentFlush(); - SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; + SkDrawFilter* setDrawFilter(SkDrawFilter* filter) override; protected: - void willSave() SK_OVERRIDE; - SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - void willRestore() SK_OVERRIDE; + void willSave() override; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override; + void willRestore() override; - void didConcat(const SkMatrix&) SK_OVERRIDE; - void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) override; + void didSetMatrix(const SkMatrix&) override; - void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint&) SK_OVERRIDE; + SkScalar constY, const SkPaint&) override; virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; + const SkMatrix* matrix, const SkPaint&) override; virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], SkXfermode* xmode, - const SkPaint& paint) SK_OVERRIDE; - - void onDrawPaint(const SkPaint&) SK_OVERRIDE; - void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; - void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; - void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE; - void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + const SkPaint& paint) override; + + void onDrawPaint(const SkPaint&) override; + void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; + void onDrawRect(const SkRect&, const SkPaint&) override; + void onDrawOval(const SkRect&, const SkPaint&) override; + void onDrawRRect(const SkRRect&, const SkPaint&) override; + void onDrawPath(const SkPath&, const SkPaint&) override; + void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - DrawBitmapRectFlags flags) SK_OVERRIDE; + DrawBitmapRectFlags flags) override; #if 0 // rely on conversion to bitmap(for now) - void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; #endif void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; - void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; + void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; - void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRegion(const SkRegion&, SkRegion::Op) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; public: class NotificationClient { @@ -232,7 +232,7 @@ public: }; protected: - SkCanvas* canvasForDrawIter() SK_OVERRIDE; + SkCanvas* canvasForDrawIter() override; SkDeferredDevice* getDeferredDevice() const; private: diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h index c6b20ebca9..cd94501a02 100644 --- a/include/utils/SkDumpCanvas.h +++ b/include/utils/SkDumpCanvas.h @@ -75,60 +75,60 @@ public: int getNestLevel() const { return fNestLevel; } - void beginCommentGroup(const char* description) SK_OVERRIDE; - void addComment(const char* kywd, const char* value) SK_OVERRIDE; - void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) override; + void addComment(const char* kywd, const char* value) override; + void endCommentGroup() override; protected: - void willSave() SK_OVERRIDE; - SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - void willRestore() SK_OVERRIDE; + void willSave() override; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override; + void willRestore() override; - void didConcat(const SkMatrix&) SK_OVERRIDE; - void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) override; + void didSetMatrix(const SkMatrix&) override; - void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint&) SK_OVERRIDE; + SkScalar constY, const SkPaint&) override; virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; + const SkMatrix* matrix, const SkPaint&) override; virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], SkXfermode* xmode, - const SkPaint& paint) SK_OVERRIDE; - - void onDrawPaint(const SkPaint&) SK_OVERRIDE; - void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; - void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; - void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE; - void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + const SkPaint& paint) override; + + void onDrawPaint(const SkPaint&) override; + void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; + void onDrawRect(const SkRect&, const SkPaint&) override; + void onDrawOval(const SkRect&, const SkPaint&) override; + void onDrawRRect(const SkRRect&, const SkPaint&) override; + void onDrawPath(const SkPath&, const SkPaint&) override; + void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - DrawBitmapRectFlags flags) SK_OVERRIDE; - void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + DrawBitmapRectFlags flags) override; + void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; - void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; + void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; - void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRegion(const SkRegion&, SkRegion::Op) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; static const char* EdgeStyleToAAString(ClipEdgeStyle edgeStyle); @@ -151,7 +151,7 @@ public: // override from baseclass that does the formatting, and in turn calls // the function pointer that was passed to the constructor virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[], - const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; private: void (*fProc)(const char*, void*); diff --git a/include/utils/SkLuaCanvas.h b/include/utils/SkLuaCanvas.h index e3541f2276..0fd37daca1 100644 --- a/include/utils/SkLuaCanvas.h +++ b/include/utils/SkLuaCanvas.h @@ -21,52 +21,52 @@ public: virtual ~SkLuaCanvas(); protected: - void willSave() SK_OVERRIDE; - SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - void willRestore() SK_OVERRIDE; + void willSave() override; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override; + void willRestore() override; - void didConcat(const SkMatrix&) SK_OVERRIDE; - void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) override; + void didSetMatrix(const SkMatrix&) override; - void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint&) SK_OVERRIDE; + SkScalar constY, const SkPaint&) override; virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; + const SkMatrix* matrix, const SkPaint&) override; virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; - void onDrawPaint(const SkPaint&) SK_OVERRIDE; - void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; - void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; - void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE; - void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + void onDrawPaint(const SkPaint&) override; + void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; + void onDrawRect(const SkRect&, const SkPaint&) override; + void onDrawOval(const SkRect&, const SkPaint&) override; + void onDrawRRect(const SkRRect&, const SkPaint&) override; + void onDrawPath(const SkPath&, const SkPaint&) override; + void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - DrawBitmapRectFlags flags) SK_OVERRIDE; - void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + DrawBitmapRectFlags flags) override; + void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; - void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; + void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; - void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRegion(const SkRegion&, SkRegion::Op) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; private: lua_State* fL; diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h index 02d715b50a..85cd90d899 100644 --- a/include/utils/SkNWayCanvas.h +++ b/include/utils/SkNWayCanvas.h @@ -23,64 +23,64 @@ public: /////////////////////////////////////////////////////////////////////////// // These are forwarded to the N canvases we're referencing - SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE; + SkDrawFilter* setDrawFilter(SkDrawFilter*) override; - void beginCommentGroup(const char* description) SK_OVERRIDE; - void addComment(const char* kywd, const char* value) SK_OVERRIDE; - void endCommentGroup() SK_OVERRIDE; + void beginCommentGroup(const char* description) override; + void addComment(const char* kywd, const char* value) override; + void endCommentGroup() override; protected: SkTDArray<SkCanvas*> fList; - void willSave() SK_OVERRIDE; - SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - void willRestore() SK_OVERRIDE; + void willSave() override; + SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveFlags) override; + void willRestore() override; - void didConcat(const SkMatrix&) SK_OVERRIDE; - void didSetMatrix(const SkMatrix&) SK_OVERRIDE; + void didConcat(const SkMatrix&) override; + void didSetMatrix(const SkMatrix&) override; - void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; + void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], - SkScalar constY, const SkPaint&) SK_OVERRIDE; + SkScalar constY, const SkPaint&) override; virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path, - const SkMatrix* matrix, const SkPaint&) SK_OVERRIDE; + const SkMatrix* matrix, const SkPaint&) override; virtual void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, - const SkPaint& paint) SK_OVERRIDE; + const SkPaint& paint) override; virtual void onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], const SkPoint texCoords[4], SkXfermode* xmode, - const SkPaint& paint) SK_OVERRIDE; - - void onDrawPaint(const SkPaint&) SK_OVERRIDE; - void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) SK_OVERRIDE; - void onDrawRect(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawOval(const SkRect&, const SkPaint&) SK_OVERRIDE; - void onDrawRRect(const SkRRect&, const SkPaint&) SK_OVERRIDE; - void onDrawPath(const SkPath&, const SkPaint&) SK_OVERRIDE; - void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + const SkPaint& paint) override; + + void onDrawPaint(const SkPaint&) override; + void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override; + void onDrawRect(const SkRect&, const SkPaint&) override; + void onDrawOval(const SkRect&, const SkPaint&) override; + void onDrawRRect(const SkRRect&, const SkPaint&) override; + void onDrawPath(const SkPath&, const SkPaint&) override; + void onDrawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawBitmapRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, - DrawBitmapRectFlags flags) SK_OVERRIDE; - void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE; + DrawBitmapRectFlags flags) override; + void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; void onDrawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, - const SkPaint*) SK_OVERRIDE; - void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) SK_OVERRIDE; + const SkPaint*) override; + void onDrawSprite(const SkBitmap&, int left, int top, const SkPaint*) override; void onDrawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, - const SkPaint&) SK_OVERRIDE; + const SkPaint&) override; - void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override; + void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override; + void onClipRegion(const SkRegion&, SkRegion::Op) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE; + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; class Iter; diff --git a/include/utils/SkNoSaveLayerCanvas.h b/include/utils/SkNoSaveLayerCanvas.h index b6926973e0..65cd4a8329 100644 --- a/include/utils/SkNoSaveLayerCanvas.h +++ b/include/utils/SkNoSaveLayerCanvas.h @@ -22,7 +22,7 @@ public: protected: virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint, - SaveFlags flags) SK_OVERRIDE { + SaveFlags flags) override { this->INHERITED::willSaveLayer(bounds, paint, flags); return kNoLayer_SaveLayerStrategy; } diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h index 8c4d81962a..2811ff855c 100644 --- a/include/views/SkOSWindow_Unix.h +++ b/include/views/SkOSWindow_Unix.h @@ -48,7 +48,7 @@ public: protected: // Overridden from from SkWindow: - void onSetTitle(const char title[]) SK_OVERRIDE; + void onSetTitle(const char title[]) override; private: enum NextXEventResult { diff --git a/include/views/SkWidget.h b/include/views/SkWidget.h index 28f0e9a047..3c9363440b 100644 --- a/include/views/SkWidget.h +++ b/include/views/SkWidget.h @@ -101,10 +101,10 @@ public: SkPushButtonWidget(uint32_t flags = 0) : SkButtonWidget(flags) {} protected: - bool onEvent(const SkEvent&) SK_OVERRIDE; - void onDraw(SkCanvas*) SK_OVERRIDE; - Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE; - bool onClick(Click* click) SK_OVERRIDE; + bool onEvent(const SkEvent&) override; + void onDraw(SkCanvas*) override; + Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override; + bool onClick(Click* click) override; private: typedef SkButtonWidget INHERITED; diff --git a/include/xml/SkXMLWriter.h b/include/xml/SkXMLWriter.h index 6e3c7de79d..45356d488f 100644 --- a/include/xml/SkXMLWriter.h +++ b/include/xml/SkXMLWriter.h @@ -69,10 +69,10 @@ public: SkDEBUGCODE(static void UnitTest();) protected: - void onStartElementLen(const char elem[], size_t length) SK_OVERRIDE; - void onEndElement() SK_OVERRIDE; - void onAddAttributeLen(const char name[], const char value[], size_t length) SK_OVERRIDE; - void onAddText(const char text[], size_t length) SK_OVERRIDE; + void onStartElementLen(const char elem[], size_t length) override; + void onEndElement() override; + void onAddAttributeLen(const char name[], const char value[], size_t length) override; + void onAddText(const char text[], size_t length) override; private: SkWStream& fStream; @@ -86,7 +86,7 @@ protected: virtual void onStartElementLen(const char elem[], size_t length); virtual void onEndElement(); virtual void onAddAttributeLen(const char name[], const char value[], size_t length); - virtual void onAddText(const char text[], size_t length) SK_OVERRIDE; + virtual void onAddText(const char text[], size_t length) override; private: SkXMLParser& fParser; }; |