| Index: Source/platform/scheduler/CancellableTaskFactoryTest.cpp
|
| diff --git a/Source/platform/scheduler/CancellableTaskFactoryTest.cpp b/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
|
| index 7e425d3a25fbcf1c9915e7adb46c649386e3fccf..80ab07c0546cc74f56c27a07ffeca79457e3e9e1 100644
|
| --- a/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
|
| +++ b/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
|
| @@ -24,7 +24,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskNotCreated)
|
| TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreated)
|
| {
|
| CancellableTaskFactory factory(nullptr);
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
|
|
| EXPECT_TRUE(factory.isPending());
|
| }
|
| @@ -37,7 +37,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndRun)
|
| {
|
| CancellableTaskFactory factory(WTF::bind(&EmptyFn));
|
| {
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
| task->run();
|
| }
|
|
|
| @@ -47,7 +47,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndRun)
|
| TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndDestroyed)
|
| {
|
| CancellableTaskFactory factory(nullptr);
|
| - delete factory.task();
|
| + delete factory.cancelAndCreate();
|
|
|
| EXPECT_FALSE(factory.isPending());
|
| }
|
| @@ -55,7 +55,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndDestroyed)
|
| TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndCancelled)
|
| {
|
| CancellableTaskFactory factory(nullptr);
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
| factory.cancel();
|
|
|
| EXPECT_FALSE(factory.isPending());
|
| @@ -79,7 +79,7 @@ public:
|
| TEST_F(CancellableTaskFactoryTest, IsPending_InCallback)
|
| {
|
| TestClass testClass;
|
| - OwnPtr<WebThread::Task> task = adoptPtr(testClass.m_factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(testClass.m_factory.cancelAndCreate());
|
| task->run();
|
| }
|
|
|
| @@ -92,7 +92,7 @@ TEST_F(CancellableTaskFactoryTest, Run_ClosureIsExecuted)
|
| {
|
| int executionCount = 0;
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
| task->run();
|
|
|
| EXPECT_EQ(1, executionCount);
|
| @@ -102,7 +102,7 @@ TEST_F(CancellableTaskFactoryTest, Run_ClosureIsExecutedOnlyOnce)
|
| {
|
| int executionCount = 0;
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
| task->run();
|
| task->run();
|
| task->run();
|
| @@ -117,7 +117,7 @@ TEST_F(CancellableTaskFactoryTest, Run_FactoryDestructionPreventsExecution)
|
| OwnPtr<WebThread::Task> task;
|
| {
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
| - task = adoptPtr(factory.task());
|
| + task = adoptPtr(factory.cancelAndCreate());
|
| }
|
| task->run();
|
|
|
| @@ -129,15 +129,15 @@ TEST_F(CancellableTaskFactoryTest, Run_TasksInSequence)
|
| int executionCount = 0;
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
|
|
| - OwnPtr<WebThread::Task> taskA = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> taskA = adoptPtr(factory.cancelAndCreate());
|
| taskA->run();
|
| EXPECT_EQ(1, executionCount);
|
|
|
| - OwnPtr<WebThread::Task> taskB = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> taskB = adoptPtr(factory.cancelAndCreate());
|
| taskB->run();
|
| EXPECT_EQ(2, executionCount);
|
|
|
| - OwnPtr<WebThread::Task> taskC = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> taskC = adoptPtr(factory.cancelAndCreate());
|
| taskC->run();
|
| EXPECT_EQ(3, executionCount);
|
| }
|
| @@ -146,7 +146,7 @@ TEST_F(CancellableTaskFactoryTest, Cancel)
|
| {
|
| int executionCount = 0;
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
| - OwnPtr<WebThread::Task> task = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
|
| factory.cancel();
|
| task->run();
|
|
|
| @@ -158,8 +158,8 @@ TEST_F(CancellableTaskFactoryTest, CreatingANewTaskCancelsPreviousOnes)
|
| int executionCount = 0;
|
| CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
|
|
|
| - OwnPtr<WebThread::Task> taskA = adoptPtr(factory.task());
|
| - OwnPtr<WebThread::Task> taskB = adoptPtr(factory.task());
|
| + OwnPtr<WebThread::Task> taskA = adoptPtr(factory.cancelAndCreate());
|
| + OwnPtr<WebThread::Task> taskB = adoptPtr(factory.cancelAndCreate());
|
|
|
| taskA->run();
|
| EXPECT_EQ(0, executionCount);
|
|
|