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

Unified Diff: tests/DeferredCanvasTest.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 | « tests/CanvasTest.cpp ('k') | tests/DrawBitmapRectTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/DeferredCanvasTest.cpp
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index e83bc8106bbf74385e9d131713480155d9b82b0f..56b1bea93fc4d9eac54bcf664b385b8a83e9066c 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -56,19 +56,19 @@ public:
fBitmap.allocN32Pixels(width, height);
}
- SkCanvas* onNewCanvas() SK_OVERRIDE {
+ SkCanvas* onNewCanvas() override {
return SkNEW_ARGS(SkCanvas, (fBitmap));
}
- SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE {
+ SkSurface* onNewSurface(const SkImageInfo&) override {
return NULL;
}
- SkImage* onNewImageSnapshot(Budgeted) SK_OVERRIDE {
+ SkImage* onNewImageSnapshot(Budgeted) override {
return SkNewImageFromBitmap(fBitmap, true, &this->props());
}
- void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE {
+ void onCopyOnWrite(ContentChangeMode mode) override {
if (mode == SkSurface::kDiscard_ContentChangeMode) {
fCOWDiscardCount++;
} else {
@@ -76,7 +76,7 @@ public:
}
}
- void onDiscard() SK_OVERRIDE {
+ void onDiscard() override {
fDiscardCount++;
}
@@ -446,7 +446,7 @@ public:
fDrawBitmapCallCount = 0;
}
virtual void drawBitmap(const SkDraw&, const SkBitmap&,
- const SkMatrix&, const SkPaint&) SK_OVERRIDE {
+ const SkMatrix&, const SkPaint&) override {
fDrawBitmapCallCount++;
}
@@ -460,16 +460,16 @@ public:
fFlushedDrawCommandsCount = fSkippedPendingDrawCommandsCount = 0;
}
- void prepareForDraw() SK_OVERRIDE {
+ void prepareForDraw() override {
fPrepareForDrawCount++;
}
- void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE {
+ void storageAllocatedForRecordingChanged(size_t) override {
fStorageAllocatedChangedCount++;
}
- void flushedDrawCommands() SK_OVERRIDE {
+ void flushedDrawCommands() override {
fFlushedDrawCommandsCount++;
}
- void skippedPendingDrawCommands() SK_OVERRIDE {
+ void skippedPendingDrawCommands() override {
fSkippedPendingDrawCommandsCount++;
}
« no previous file with comments | « tests/CanvasTest.cpp ('k') | tests/DrawBitmapRectTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698