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

Unified Diff: tests/RecordDrawTest.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/QuickRejectTest.cpp ('k') | tests/RecordReplaceDrawTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « tests/QuickRejectTest.cpp ('k') | tests/RecordReplaceDrawTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698