Index: tests/SkpSkGrTest.cpp |
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp |
index c1883a989033f783dc40851bfd7ad0c2e9b9e804..775a30f28480394ccf2ca2b90f4e667ffbb76725 100644 |
--- a/tests/SkpSkGrTest.cpp |
+++ b/tests/SkpSkGrTest.cpp |
@@ -18,12 +18,12 @@ |
#include "SkOSFile.h" |
#include "SkPicture.h" |
#include "SkRTConf.h" |
-#include "SkRunnable.h" |
+#include "Runnable.h" |
#include "SkStream.h" |
#include "SkString.h" |
#include "SkTArray.h" |
#include "SkTDArray.h" |
-#include "SkThreadPool.h" |
+#include "ThreadPool.h" |
#include "SkTime.h" |
#include "Test.h" |
@@ -137,7 +137,7 @@ struct SkpSkGrThreadedTestRunner { |
skiatest::Reporter* fReporter; |
}; |
-class SkpSkGrThreadedRunnable : public SkRunnable { |
+class SkpSkGrThreadedRunnable : public Runnable { |
public: |
SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, const char* str, |
SkpSkGrThreadedTestRunner* runner) { |
@@ -164,7 +164,7 @@ SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() { |
} |
void SkpSkGrThreadedTestRunner::render() { |
- SkThreadPool pool(fNumThreads); |
+ ThreadPool pool(fNumThreads); |
for (int index = 0; index < fRunnables.count(); ++ index) { |
pool.add(fRunnables[index]); |
} |