| Index: tests/RecordDrawTest.cpp
|
| diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
|
| index baee712b37de261c0a02f0577292a74c8e970f71..1e365bce30390e40e7c971ca5bdd463bb4e6949c 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;
|
| }
|
|
|
|
|