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

Side by Side Diff: tests/LayerDrawLooperTest.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/ImageFilterTest.cpp ('k') | tests/LazyPtrTest.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 2013 Google Inc. 2 * Copyright 2013 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 "SkBitmap.h" 8 #include "SkBitmap.h"
9 #include "SkBitmapDevice.h" 9 #include "SkBitmapDevice.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 12 matching lines...) Expand all
23 SkBitmap bm; 23 SkBitmap bm;
24 bm.allocN32Pixels(w, h); 24 bm.allocN32Pixels(w, h);
25 return bm; 25 return bm;
26 } 26 }
27 27
28 class FakeDevice : public SkBitmapDevice { 28 class FakeDevice : public SkBitmapDevice {
29 public: 29 public:
30 FakeDevice() : SkBitmapDevice(make_bm(100, 100)) { } 30 FakeDevice() : SkBitmapDevice(make_bm(100, 100)) { }
31 31
32 virtual void drawRect(const SkDraw& draw, const SkRect& r, 32 virtual void drawRect(const SkDraw& draw, const SkRect& r,
33 const SkPaint& paint) SK_OVERRIDE { 33 const SkPaint& paint) override {
34 fLastMatrix = *draw.fMatrix; 34 fLastMatrix = *draw.fMatrix;
35 this->INHERITED::drawRect(draw, r, paint); 35 this->INHERITED::drawRect(draw, r, paint);
36 } 36 }
37 37
38 SkMatrix fLastMatrix; 38 SkMatrix fLastMatrix;
39 39
40 private: 40 private:
41 typedef SkBitmapDevice INHERITED; 41 typedef SkBitmapDevice INHERITED;
42 }; 42 };
43 43
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 // Only two layers were added, so that should be the end. 160 // Only two layers were added, so that should be the end.
161 REPORTER_ASSERT(reporter, !context->next(&canvas, &paint)); 161 REPORTER_ASSERT(reporter, !context->next(&canvas, &paint));
162 } 162 }
163 163
164 DEF_TEST(LayerDrawLooper, reporter) { 164 DEF_TEST(LayerDrawLooper, reporter) {
165 test_frontToBack(reporter); 165 test_frontToBack(reporter);
166 test_backToFront(reporter); 166 test_backToFront(reporter);
167 test_mixed(reporter); 167 test_mixed(reporter);
168 } 168 }
OLDNEW
« no previous file with comments | « tests/ImageFilterTest.cpp ('k') | tests/LazyPtrTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698