| OLD | NEW |
| 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 #include "Test.h" | 8 #include "Test.h" |
| 9 | 9 |
| 10 #include "SkString.h" | 10 #include "SkString.h" |
| 11 #include "SkTArray.h" | 11 #include "SkTArray.h" |
| 12 #include "SkTime.h" | 12 #include "SkTime.h" |
| 13 #include "SkError.h" | 13 #include "SkError.h" |
| 14 | 14 |
| 15 #if SK_SUPPORT_GPU | 15 #if SK_SUPPORT_GPU |
| 16 #include "GrContext.h" | 16 #include "GrContext.h" |
| 17 #include "gl/SkNativeGLContext.h" | 17 #include "gl/SkNativeGLContext.h" |
| 18 #else | 18 #else |
| 19 class GrContext; | 19 class GrContext; |
| 20 #endif | 20 #endif |
| 21 | 21 |
| 22 SK_DEFINE_INST_COUNT(skiatest::Reporter) | |
| 23 | |
| 24 using namespace skiatest; | 22 using namespace skiatest; |
| 25 | 23 |
| 26 Reporter::Reporter() : fTestCount(0) { | 24 Reporter::Reporter() : fTestCount(0) { |
| 27 } | 25 } |
| 28 | 26 |
| 29 void Reporter::startTest(Test* test) { | 27 void Reporter::startTest(Test* test) { |
| 30 this->bumpTestCount(); | 28 this->bumpTestCount(); |
| 31 this->onStart(test); | 29 this->onStart(test); |
| 32 } | 30 } |
| 33 | 31 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 #else | 129 #else |
| 132 return NULL; | 130 return NULL; |
| 133 #endif | 131 #endif |
| 134 } | 132 } |
| 135 | 133 |
| 136 void GpuTest::DestroyContexts() { | 134 void GpuTest::DestroyContexts() { |
| 137 #if SK_SUPPORT_GPU | 135 #if SK_SUPPORT_GPU |
| 138 gGrContextFactory.destroyContexts(); | 136 gGrContextFactory.destroyContexts(); |
| 139 #endif | 137 #endif |
| 140 } | 138 } |
| OLD | NEW |