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

Side by Side Diff: tests/Test.cpp

Issue 639793002: Revert of Make the Sk GL context class an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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/GLInterfaceValidationTest.cpp ('k') | tools/PictureRenderer.h » ('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 "Test.h" 8 #include "Test.h"
9 9
10 #include "SkCommandLineFlags.h" 10 #include "SkCommandLineFlags.h"
11 #include "SkError.h" 11 #include "SkError.h"
12 #include "SkString.h" 12 #include "SkString.h"
13 #include "SkTArray.h" 13 #include "SkTArray.h"
14 #include "SkTime.h" 14 #include "SkTime.h"
15 15
16 #if SK_SUPPORT_GPU 16 #if SK_SUPPORT_GPU
17 #include "GrContext.h" 17 #include "GrContext.h"
18 #include "gl/SkGLContext.h" 18 #include "gl/SkNativeGLContext.h"
19 #else 19 #else
20 class GrContext; 20 class GrContext;
21 #endif 21 #endif
22 22
23 DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use."); 23 DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
24 24
25 using namespace skiatest; 25 using namespace skiatest;
26 26
27 Reporter::Reporter() : fTestCount(0) { 27 Reporter::Reporter() : fTestCount(0) {
28 } 28 }
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 fReporter->reportFailed(local.failure(i)); 109 fReporter->reportFailed(local.failure(i));
110 } 110 }
111 fReporter->endTest(this); 111 fReporter->endTest(this);
112 112
113 } 113 }
114 114
115 SkString Test::GetTmpDir() { 115 SkString Test::GetTmpDir() {
116 const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0]; 116 const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
117 return SkString(tmpDir); 117 return SkString(tmpDir);
118 } 118 }
OLDNEW
« no previous file with comments | « tests/GLInterfaceValidationTest.cpp ('k') | tools/PictureRenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698