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

Side by Side Diff: tests/GrMemoryPoolTest.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « src/views/animated/SkWidgetViews.cpp ('k') | tests/LListTest.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 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 // This is a GPU-backend specific test 9 // This is a GPU-backend specific test
10 #if SK_SUPPORT_GPU 10 #if SK_SUPPORT_GPU
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #if SK_ENABLE_INST_COUNT 60 #if SK_ENABLE_INST_COUNT
61 SkASSERT(0 == GetInstanceCount()); 61 SkASSERT(0 == GetInstanceCount());
62 #endif 62 #endif
63 gPool.reset(NULL); 63 gPool.reset(NULL);
64 } 64 }
65 65
66 private: 66 private:
67 static SkAutoTDelete<GrMemoryPool> gPool; 67 static SkAutoTDelete<GrMemoryPool> gPool;
68 char fChar; 68 char fChar;
69 }; 69 };
70 SK_DEFINE_INST_COUNT(A); 70
71 SkAutoTDelete<GrMemoryPool> A::gPool; 71 SkAutoTDelete<GrMemoryPool> A::gPool;
72 72
73 class B : public A { 73 class B : public A {
74 public: 74 public:
75 B() {}; 75 B() {};
76 virtual void setValues(int v) { 76 virtual void setValues(int v) {
77 fDouble = static_cast<double>(v); 77 fDouble = static_cast<double>(v);
78 this->INHERITED::setValues(v); 78 this->INHERITED::setValues(v);
79 } 79 }
80 virtual bool checkValues(int v) { 80 virtual bool checkValues(int v) {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 REPORTER_ASSERT(reporter, !A::GetInstanceCount()); 236 REPORTER_ASSERT(reporter, !A::GetInstanceCount());
237 #endif 237 #endif
238 } 238 }
239 } 239 }
240 } 240 }
241 241
242 #include "TestClassDef.h" 242 #include "TestClassDef.h"
243 DEFINE_TESTCLASS("GrMemoryPool", GrMemoryPoolClass, test_memory_pool) 243 DEFINE_TESTCLASS("GrMemoryPool", GrMemoryPoolClass, test_memory_pool)
244 244
245 #endif 245 #endif
OLDNEW
« no previous file with comments | « src/views/animated/SkWidgetViews.cpp ('k') | tests/LListTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698