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

Side by Side Diff: tests/GLProgramsTest.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/FrontBufferedStreamTest.cpp ('k') | tests/ImageCacheTest.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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This is a GPU-backend specific test. It relies on static intializers to work 9 // This is a GPU-backend specific test. It relies on static intializers to work
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 typedef GrGLFragmentProcessor INHERITED; 54 typedef GrGLFragmentProcessor INHERITED;
55 }; 55 };
56 56
57 class BigKeyProcessor : public GrFragmentProcessor { 57 class BigKeyProcessor : public GrFragmentProcessor {
58 public: 58 public:
59 static GrFragmentProcessor* Create() { 59 static GrFragmentProcessor* Create() {
60 GR_CREATE_STATIC_PROCESSOR(gBigKeyProcessor, BigKeyProcessor, ()) 60 GR_CREATE_STATIC_PROCESSOR(gBigKeyProcessor, BigKeyProcessor, ())
61 return SkRef(gBigKeyProcessor); 61 return SkRef(gBigKeyProcessor);
62 } 62 }
63 63
64 const char* name() const SK_OVERRIDE { return "Big Ole Key"; } 64 const char* name() const override { return "Big Ole Key"; }
65 65
66 virtual void getGLProcessorKey(const GrGLCaps& caps, 66 virtual void getGLProcessorKey(const GrGLCaps& caps,
67 GrProcessorKeyBuilder* b) const SK_OVERRIDE { 67 GrProcessorKeyBuilder* b) const override {
68 GLBigKeyProcessor::GenKey(*this, caps, b); 68 GLBigKeyProcessor::GenKey(*this, caps, b);
69 } 69 }
70 70
71 GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE { 71 GrGLFragmentProcessor* createGLInstance() const override {
72 return SkNEW_ARGS(GLBigKeyProcessor, (*this)); 72 return SkNEW_ARGS(GLBigKeyProcessor, (*this));
73 } 73 }
74 74
75 private: 75 private:
76 BigKeyProcessor() { 76 BigKeyProcessor() {
77 this->initClassID<BigKeyProcessor>(); 77 this->initClassID<BigKeyProcessor>();
78 } 78 }
79 bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } 79 bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
80 void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE { } 80 void onComputeInvariantOutput(GrInvariantOutput* inout) const override { }
81 81
82 GR_DECLARE_FRAGMENT_PROCESSOR_TEST; 82 GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
83 83
84 typedef GrFragmentProcessor INHERITED; 84 typedef GrFragmentProcessor INHERITED;
85 }; 85 };
86 86
87 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(BigKeyProcessor); 87 GR_DEFINE_FRAGMENT_PROCESSOR_TEST(BigKeyProcessor);
88 88
89 GrFragmentProcessor* BigKeyProcessor::TestCreate(SkRandom*, 89 GrFragmentProcessor* BigKeyProcessor::TestCreate(SkRandom*,
90 GrContext*, 90 GrContext*,
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 } 373 }
374 #endif 374 #endif
375 GrTestTarget target; 375 GrTestTarget target;
376 context->getTestTarget(&target); 376 context->getTestTarget(&target);
377 REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages )); 377 REPORTER_ASSERT(reporter, target.target()->programUnitTest(maxStages ));
378 } 378 }
379 } 379 }
380 } 380 }
381 381
382 #endif 382 #endif
OLDNEW
« no previous file with comments | « tests/FrontBufferedStreamTest.cpp ('k') | tests/ImageCacheTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698