Index: src/utils/SkCanvasStack.h |
diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h |
index 27bc6bc018ec4349ecdc3d5066c74362029224e3..6602110e31d63575a45f39ba704d019746010b24 100644 |
--- a/src/utils/SkCanvasStack.h |
+++ b/src/utils/SkCanvasStack.h |
@@ -18,7 +18,7 @@ public: |
virtual ~SkCanvasStack(); |
void pushCanvas(SkCanvas* canvas, const SkIPoint& origin); |
- void removeAll() SK_OVERRIDE; |
+ void removeAll() override; |
/* |
* The following add/remove canvas methods are overrides from SkNWayCanvas |
@@ -26,16 +26,16 @@ public: |
* can share most of the other implementation of NWay we override those |
* methods to be no-ops. |
*/ |
- void addCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } |
- void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } |
+ void addCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); } |
+ void removeCanvas(SkCanvas*) override { SkDEBUGFAIL("Invalid Op"); } |
protected: |
- void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
+ void didSetMatrix(const SkMatrix&) 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; |
private: |
void clipToZOrderedBounds(); |