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

Side by Side Diff: tests/QuickRejectTest.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 unified diff | Download patch
« no previous file with comments | « tests/PixelRefTest.cpp ('k') | tests/RecordDrawTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkCanvas.h" 8 #include "SkCanvas.h"
9 #include "SkDrawLooper.h" 9 #include "SkDrawLooper.h"
10 #include "SkTypes.h" 10 #include "SkTypes.h"
11 #include "Test.h" 11 #include "Test.h"
12 12
13 /* 13 /*
14 * Subclass of looper that just draws once, with an offset in X. 14 * Subclass of looper that just draws once, with an offset in X.
15 */ 15 */
16 class TestLooper : public SkDrawLooper { 16 class TestLooper : public SkDrawLooper {
17 public: 17 public:
18 18
19 SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const SK_OVER RIDE { 19 SkDrawLooper::Context* createContext(SkCanvas*, void* storage) const overrid e {
20 return SkNEW_PLACEMENT(storage, TestDrawLooperContext); 20 return SkNEW_PLACEMENT(storage, TestDrawLooperContext);
21 } 21 }
22 22
23 size_t contextSize() const SK_OVERRIDE { return sizeof(TestDrawLooperContext ); } 23 size_t contextSize() const override { return sizeof(TestDrawLooperContext); }
24 24
25 #ifndef SK_IGNORE_TO_STRING 25 #ifndef SK_IGNORE_TO_STRING
26 void toString(SkString* str) const SK_OVERRIDE { 26 void toString(SkString* str) const override {
27 str->append("TestLooper:"); 27 str->append("TestLooper:");
28 } 28 }
29 #endif 29 #endif
30 30
31 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper); 31 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestLooper);
32 32
33 private: 33 private:
34 class TestDrawLooperContext : public SkDrawLooper::Context { 34 class TestDrawLooperContext : public SkDrawLooper::Context {
35 public: 35 public:
36 TestDrawLooperContext() : fOnce(true) {} 36 TestDrawLooperContext() : fOnce(true) {}
37 virtual ~TestDrawLooperContext() {} 37 virtual ~TestDrawLooperContext() {}
38 38
39 bool next(SkCanvas* canvas, SkPaint*) SK_OVERRIDE { 39 bool next(SkCanvas* canvas, SkPaint*) override {
40 if (fOnce) { 40 if (fOnce) {
41 fOnce = false; 41 fOnce = false;
42 canvas->translate(SkIntToScalar(10), 0); 42 canvas->translate(SkIntToScalar(10), 0);
43 return true; 43 return true;
44 } 44 }
45 return false; 45 return false;
46 } 46 }
47 private: 47 private:
48 bool fOnce; 48 bool fOnce;
49 }; 49 };
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 SkRect bounds = SkRect::MakeLTRB(50, 50, 70, 70); 100 SkRect bounds = SkRect::MakeLTRB(50, 50, 70, 70);
101 canvas.saveLayer(&bounds, NULL); 101 canvas.saveLayer(&bounds, NULL);
102 REPORTER_ASSERT(reporter, true == canvas.quickReject(SkRect::MakeWH(10, 10)) ); 102 REPORTER_ASSERT(reporter, true == canvas.quickReject(SkRect::MakeWH(10, 10)) );
103 REPORTER_ASSERT(reporter, false == canvas.quickReject(SkRect::MakeWH(60, 60) )); 103 REPORTER_ASSERT(reporter, false == canvas.quickReject(SkRect::MakeWH(60, 60) ));
104 } 104 }
105 105
106 DEF_TEST(QuickReject, reporter) { 106 DEF_TEST(QuickReject, reporter) {
107 test_drawBitmap(reporter); 107 test_drawBitmap(reporter);
108 test_layers(reporter); 108 test_layers(reporter);
109 } 109 }
OLDNEW
« no previous file with comments | « tests/PixelRefTest.cpp ('k') | tests/RecordDrawTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698