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 /tests/RecordDrawTest.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 'tests/RecordDrawTest.cpp')
-rw-r--r-- | tests/RecordDrawTest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp index baee712b37..1e365bce30 100644 --- a/tests/RecordDrawTest.cpp +++ b/tests/RecordDrawTest.cpp @@ -24,7 +24,7 @@ class JustOneDraw : public SkPicture::AbortCallback { public: JustOneDraw() : fCalls(0) {} - bool abort() SK_OVERRIDE { return fCalls++ > 0; } + bool abort() override { return fCalls++ > 0; } private: int fCalls; }; @@ -123,7 +123,7 @@ DEF_TEST(RecordDraw_SetMatrixClobber, r) { } struct TestBBH : public SkBBoxHierarchy { - void insert(const SkRect boundsArray[], int N) SK_OVERRIDE { + void insert(const SkRect boundsArray[], int N) override { fEntries.setCount(N); for (int i = 0; i < N; i++) { Entry e = { (unsigned)i, boundsArray[i] }; @@ -131,9 +131,9 @@ struct TestBBH : public SkBBoxHierarchy { } } - void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {} - size_t bytesUsed() const SK_OVERRIDE { return 0; } - SkRect getRootBound() const SK_OVERRIDE { return SkRect::MakeEmpty(); } + void search(const SkRect& query, SkTDArray<unsigned>* results) const override {} + size_t bytesUsed() const override { return 0; } + SkRect getRootBound() const override { return SkRect::MakeEmpty(); } struct Entry { unsigned opIndex; @@ -290,12 +290,12 @@ DEF_TEST(RecordDraw_drawImage, r){ } void onDrawImage(const SkImage* image, SkScalar left, SkScalar top, - const SkPaint* paint) SK_OVERRIDE { + const SkPaint* paint) override { fDrawImageCalled = true; } void onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst, - const SkPaint* paint) SK_OVERRIDE { + const SkPaint* paint) override { fDrawImageRectCalled = true; } |