Index: tests/PathOpsSkpClipTest.cpp |
diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp |
old mode 100755 |
new mode 100644 |
index 95421fca30bbb2d58dbfb63bb35c6bdb8a81357d..de4f48c586827300fb12b7e818c289157972e8c1 |
--- a/tests/PathOpsSkpClipTest.cpp |
+++ b/tests/PathOpsSkpClipTest.cpp |
@@ -300,7 +300,7 @@ public: |
TestRunner::~TestRunner() { |
for (int index = 0; index < fRunnables.count(); index++) { |
- SkDELETE(fRunnables[index]); |
+ delete fRunnables[index]; |
} |
} |
@@ -799,8 +799,8 @@ static void encodeFound(TestState& state) { |
if (!filename.endsWith(".skp")) { |
filename.append(".skp"); |
} |
- *testRunner.fRunnables.append() = SkNEW_ARGS(TestRunnableEncode, |
- (&testSkpClipEncode, result.fDirNo, filename.c_str(), &testRunner)); |
+ *testRunner.fRunnables.append() = new TestRunnableEncode(&testSkpClipEncode, result.fDirNo, |
+ filename.c_str(), &testRunner); |
} |
testRunner.render(); |
} |
@@ -823,18 +823,17 @@ private: |
typedef SkTRegistry<Test*(*)(void*)> TestRegistry; |
-#define DEF_TEST(name) \ |
- static void test_##name(); \ |
- class name##Class : public Test { \ |
- public: \ |
- static Test* Factory(void*) { return SkNEW(name##Class); } \ |
- protected: \ |
- void onGetName(SkString* name) override { \ |
- name->set(#name); \ |
- } \ |
- void onRun() override { test_##name(); } \ |
- }; \ |
- static TestRegistry gReg_##name##Class(name##Class::Factory); \ |
+#define DEF_TEST(name) \ |
+ static void test_##name(); \ |
+ class name##Class : public Test { \ |
+ public: \ |
+ static Test* Factory(void*) { return new name##Class; } \ |
+ \ |
+ protected: \ |
+ void onGetName(SkString* name) override { name->set(#name); } \ |
+ void onRun() override { test_##name(); } \ |
+ }; \ |
+ static TestRegistry gReg_##name##Class(name##Class::Factory); \ |
static void test_##name() |
DEF_TEST(PathOpsSkpClip) { |
@@ -868,8 +867,7 @@ DEF_TEST(PathOpsSkpClipThreaded) { |
int dirNo; |
gDirs.reset(); |
while ((dirNo = gDirs.next()) > 0) { |
- *testRunner.fRunnables.append() = SkNEW_ARGS(TestRunnableDir, |
- (&testSkpClipMain, dirNo, &testRunner)); |
+ *testRunner.fRunnables.append() = new TestRunnableDir(&testSkpClipMain, dirNo, &testRunner); |
} |
testRunner.render(); |
TestState state; |
@@ -934,8 +932,8 @@ DEF_TEST(PathOpsSkpClipUberThreaded) { |
int count = sorted.get()[dirNo - firstDirNo].count(); |
if (SkTSearch<SortByName, Less>(sorted.get()[dirNo - firstDirNo].begin(), |
count, &name, sizeof(&name)) < 0) { |
- *testRunner.fRunnables.append() = SkNEW_ARGS(TestRunnableFile, |
- (&testSkpClip, dirNo, filename.c_str(), &testRunner)); |
+ *testRunner.fRunnables.append() = new TestRunnableFile( |
+ &testSkpClip, dirNo, filename.c_str(), &testRunner); |
} |
} |
checkEarlyExit: |