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 /bench/MergeBench.cpp | |
| 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 'bench/MergeBench.cpp')
| -rw-r--r-- | bench/MergeBench.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 1e8069ee0e..05d6822f4c 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -20,11 +20,11 @@ public: MergeBench(bool small) : fIsSmall(small), fInitialized(false) { } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fIsSmall ? "merge_small" : "merge_large"; } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { if (!fInitialized) { make_bitmap(); make_checkerboard(); @@ -32,7 +32,7 @@ protected: } } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r = fIsSmall ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) : SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE); SkPaint paint; |