Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/platform/graphics/InterceptingCanvas.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/graphics/ImageLayerChromiumTest.cpp ('k') | Source/platform/graphics/LoggingCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/InterceptingCanvas.h
diff --git a/Source/platform/graphics/InterceptingCanvas.h b/Source/platform/graphics/InterceptingCanvas.h
index eaf4429f1ebfb3cd531a4113a3150c26ae0f3e55..678c4067654ab0eb9a7cf7b915358135465e5349 100644
--- a/Source/platform/graphics/InterceptingCanvas.h
+++ b/Source/platform/graphics/InterceptingCanvas.h
@@ -40,42 +40,42 @@ public:
InterceptingCanvas(SkBitmap bitmap) : SkCanvas(bitmap), m_depthCount(0) { };
InterceptingCanvas(int width, int height) : SkCanvas(width, height), m_depthCount(0) { };
- virtual void clear(SkColor) OVERRIDE = 0;
- virtual void drawPaint(const SkPaint&) OVERRIDE = 0;
- virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) OVERRIDE = 0;
- virtual void drawRect(const SkRect&, const SkPaint&) OVERRIDE = 0;
- virtual void drawOval(const SkRect&, const SkPaint&) OVERRIDE = 0;
- virtual void drawRRect(const SkRRect&, const SkPaint&) OVERRIDE = 0;
- virtual void drawPath(const SkPath&, const SkPaint&) OVERRIDE = 0;
- virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint* = 0) OVERRIDE = 0;
- virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, DrawBitmapRectFlags) OVERRIDE = 0;
- virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPaint* = 0) OVERRIDE = 0;
- virtual void drawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, const SkPaint*) OVERRIDE = 0;
- virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* = 0) OVERRIDE = 0;
+ virtual void clear(SkColor) override = 0;
+ virtual void drawPaint(const SkPaint&) override = 0;
+ virtual void drawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) override = 0;
+ virtual void drawRect(const SkRect&, const SkPaint&) override = 0;
+ virtual void drawOval(const SkRect&, const SkPaint&) override = 0;
+ virtual void drawRRect(const SkRRect&, const SkPaint&) override = 0;
+ virtual void drawPath(const SkPath&, const SkPaint&) override = 0;
+ virtual void drawBitmap(const SkBitmap&, SkScalar left, SkScalar top, const SkPaint* = 0) override = 0;
+ virtual void drawBitmapRectToRect(const SkBitmap&, const SkRect* src, const SkRect& dst, const SkPaint*, DrawBitmapRectFlags) override = 0;
+ virtual void drawBitmapMatrix(const SkBitmap&, const SkMatrix&, const SkPaint* = 0) override = 0;
+ virtual void drawBitmapNine(const SkBitmap&, const SkIRect& center, const SkRect& dst, const SkPaint*) override = 0;
+ virtual void drawSprite(const SkBitmap&, int left, int top, const SkPaint* = 0) override = 0;
virtual void drawVertices(VertexMode vmode, int vertexCount, const SkPoint vertices[], const SkPoint texs[],
- const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint&) OVERRIDE = 0;
- virtual void drawData(const void* data, size_t length) OVERRIDE = 0;
- virtual void beginCommentGroup(const char* description) OVERRIDE = 0;
- virtual void addComment(const char* keyword, const char* value) OVERRIDE = 0;
- virtual void endCommentGroup() OVERRIDE = 0;
+ const SkColor colors[], SkXfermode* xmode, const uint16_t indices[], int indexCount, const SkPaint&) override = 0;
+ virtual void drawData(const void* data, size_t length) override = 0;
+ virtual void beginCommentGroup(const char* description) override = 0;
+ virtual void addComment(const char* keyword, const char* value) override = 0;
+ virtual void endCommentGroup() override = 0;
- virtual void onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint&) OVERRIDE = 0;
- virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) OVERRIDE = 0;
- virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], const SkPaint&) OVERRIDE = 0;
- virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, const SkPaint&) OVERRIDE = 0;
- virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath&, const SkMatrix*, const SkPaint&) OVERRIDE = 0;
- virtual void onPushCull(const SkRect& cullRect) OVERRIDE = 0;
- virtual void onPopCull() OVERRIDE = 0;
- virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE = 0;
- virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE = 0;
- virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE = 0;
- virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE = 0;
- virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) OVERRIDE = 0;
- virtual void didSetMatrix(const SkMatrix&) OVERRIDE = 0;
- virtual void didConcat(const SkMatrix&) OVERRIDE = 0;
- virtual void willSave() OVERRIDE = 0;
- SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFlags) OVERRIDE = 0;
- virtual void willRestore() OVERRIDE = 0;
+ virtual void onDrawDRRect(const SkRRect& outer, const SkRRect& inner, const SkPaint&) override = 0;
+ virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y, const SkPaint&) override = 0;
+ virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[], const SkPaint&) override = 0;
+ virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, const SkPaint&) override = 0;
+ virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkPath&, const SkMatrix*, const SkPaint&) override = 0;
+ virtual void onPushCull(const SkRect& cullRect) override = 0;
+ virtual void onPopCull() override = 0;
+ virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override = 0;
+ virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override = 0;
+ virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override = 0;
+ virtual void onClipRegion(const SkRegion&, SkRegion::Op) override = 0;
+ virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override = 0;
+ virtual void didSetMatrix(const SkMatrix&) override = 0;
+ virtual void didConcat(const SkMatrix&) override = 0;
+ virtual void willSave() override = 0;
+ SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFlags) override = 0;
+ virtual void willRestore() override = 0;
protected:
unsigned m_depthCount;
« no previous file with comments | « Source/platform/graphics/ImageLayerChromiumTest.cpp ('k') | Source/platform/graphics/LoggingCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698