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/SkpSkGrTest.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/ResourceCacheTest.cpp ('k') | tests/skia_test.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 #if !SK_SUPPORT_GPU 1 #if !SK_SUPPORT_GPU
2 #error "GPU support required" 2 #error "GPU support required"
3 #endif 3 #endif
4 4
5 #include "GrContext.h" 5 #include "GrContext.h"
6 #include "GrContextFactory.h" 6 #include "GrContextFactory.h"
7 #include "GrRenderTarget.h" 7 #include "GrRenderTarget.h"
8 #include "SkGpuDevice.h" 8 #include "SkGpuDevice.h"
9 #include "gl/GrGLDefines.h" 9 #include "gl/GrGLDefines.h"
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 public: 139 public:
140 SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, con st char* str, 140 SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, con st char* str,
141 SkpSkGrThreadedTestRunner* runner) { 141 SkpSkGrThreadedTestRunner* runner) {
142 SkASSERT(strlen(str) < sizeof(fState.fResult.fFilename) - 1); 142 SkASSERT(strlen(str) < sizeof(fState.fResult.fFilename) - 1);
143 fState.init(dirNo); 143 fState.init(dirNo);
144 strcpy(fState.fResult.fFilename, str); 144 strcpy(fState.fResult.fFilename, str);
145 fState.fReporter = runner->fReporter; 145 fState.fReporter = runner->fReporter;
146 fTestFun = testFun; 146 fTestFun = testFun;
147 } 147 }
148 148
149 void run() SK_OVERRIDE { 149 void run() override {
150 SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); 150 SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024);
151 (*fTestFun)(&fState); 151 (*fTestFun)(&fState);
152 } 152 }
153 153
154 SkpSkGrThreadState fState; 154 SkpSkGrThreadState fState;
155 void (*fTestFun)(SkpSkGrThreadState*); 155 void (*fTestFun)(SkpSkGrThreadState*);
156 }; 156 };
157 157
158 SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() { 158 SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() {
159 for (int index = 0; index < fRunnables.count(); index++) { 159 for (int index = 0; index < fRunnables.count(); index++) {
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 int testIndex = 166; 743 int testIndex = 166;
744 int dirIndex = skipOverSkGr[testIndex - 166].directory; 744 int dirIndex = skipOverSkGr[testIndex - 166].directory;
745 SkString pictDir = make_in_dir_name(dirIndex); 745 SkString pictDir = make_in_dir_name(dirIndex);
746 if (pictDir.size() == 0) { 746 if (pictDir.size() == 0) {
747 return; 747 return;
748 } 748 }
749 SkString filename(skipOverSkGr[testIndex - 166].filename); 749 SkString filename(skipOverSkGr[testIndex - 166].filename);
750 TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose ()); 750 TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose ());
751 TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose ()); 751 TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose ());
752 } 752 }
OLDNEW
« no previous file with comments | « tests/ResourceCacheTest.cpp ('k') | tests/skia_test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698