Index: tests/SkpSkGrTest.cpp |
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp |
index 241395a7533c09e80d76541295e6b4d11c5df6b6..8cc7ec4a2d98817a7b569245dd91e890435862dd 100644 |
--- a/tests/SkpSkGrTest.cpp |
+++ b/tests/SkpSkGrTest.cpp |
@@ -21,7 +21,6 @@ |
#include "SkOSFile.h" |
#include "SkPicture.h" |
#include "SkRTConf.h" |
-#include "SkRunnable.h" |
#include "SkStream.h" |
#include "SkString.h" |
#include "SkTArray.h" |
@@ -142,7 +141,7 @@ struct SkpSkGrThreadedTestRunner { |
skiatest::Reporter* fReporter; |
}; |
-class SkpSkGrThreadedRunnable : public SkRunnable { |
+class SkpSkGrThreadedRunnable { |
public: |
SkpSkGrThreadedRunnable(void (*testFun)(SkpSkGrThreadState*), int dirNo, const char* str, |
SkpSkGrThreadedTestRunner* runner) { |
@@ -153,7 +152,7 @@ public: |
fTestFun = testFun; |
} |
- void run() override { |
+ void operator()() { |
SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); |
(*fTestFun)(&fState); |
} |
@@ -169,10 +168,8 @@ SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() { |
} |
void SkpSkGrThreadedTestRunner::render() { |
- // TODO: we don't really need to be using SkRunnables here anymore. |
- // We can just write the code we'd run right in the for loop. |
SkTaskGroup().batch(fRunnables.count(), [&](int i) { |
- fRunnables[i]->run(); |
+ fRunnables[i](); |
}); |
} |