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

Unified Diff: tests/DeferredCanvasTest.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 1c1970a03f00898bcc4861afd90ac41d3bc7167d..4ec67ae1ba72ebb8214a6561e49836c029cd1b7e 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -56,19 +56,19 @@ public:
fBitmap.allocN32Pixels(width, height);
}
- virtual SkCanvas* onNewCanvas() SK_OVERRIDE {
+ SkCanvas* onNewCanvas() SK_OVERRIDE {
return SkNEW_ARGS(SkCanvas, (fBitmap));
}
- virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE {
+ SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE {
return NULL;
}
- virtual SkImage* onNewImageSnapshot() SK_OVERRIDE {
+ SkImage* onNewImageSnapshot() SK_OVERRIDE {
return SkNewImageFromBitmap(fBitmap, true, &this->props());
}
- virtual void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE {
+ void onCopyOnWrite(ContentChangeMode mode) SK_OVERRIDE {
if (mode == SkSurface::kDiscard_ContentChangeMode) {
fDiscardCount++;
} else {
@@ -426,16 +426,16 @@ public:
fFlushedDrawCommandsCount = fSkippedPendingDrawCommandsCount = 0;
}
- virtual void prepareForDraw() SK_OVERRIDE {
+ void prepareForDraw() SK_OVERRIDE {
fPrepareForDrawCount++;
}
- virtual void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE {
+ void storageAllocatedForRecordingChanged(size_t) SK_OVERRIDE {
fStorageAllocatedChangedCount++;
}
- virtual void flushedDrawCommands() SK_OVERRIDE {
+ void flushedDrawCommands() SK_OVERRIDE {
fFlushedDrawCommandsCount++;
}
- virtual void skippedPendingDrawCommands() SK_OVERRIDE {
+ void skippedPendingDrawCommands() SK_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