| Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
|
| index d234255b3d382790ce924e30ee659c249e282e85..37133b494fd5f271b49736b46fe7723565187e03 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
|
| @@ -429,10 +429,11 @@ void postAndWaitCreateBridgeTask(const WebTraceLocation& location,
|
| std::unique_ptr<WaitableEvent> bridgeCreatedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| testThread->getWebTaskRunner()->postTask(
|
| - location, crossThreadBind(
|
| - &runCreateBridgeTask, crossThreadUnretained(bridgePtr),
|
| - crossThreadUnretained(gl), crossThreadUnretained(testHost),
|
| - crossThreadUnretained(bridgeCreatedEvent.get())));
|
| + location,
|
| + crossThreadBind(&runCreateBridgeTask, crossThreadUnretained(bridgePtr),
|
| + crossThreadUnretained(gl),
|
| + crossThreadUnretained(testHost),
|
| + crossThreadUnretained(bridgeCreatedEvent.get())));
|
| bridgeCreatedEvent->wait();
|
| }
|
|
|
| @@ -447,8 +448,9 @@ void postDestroyBridgeTask(const WebTraceLocation& location,
|
| WebThread* testThread,
|
| Canvas2DLayerBridgePtr* bridgePtr) {
|
| testThread->getWebTaskRunner()->postTask(
|
| - location, crossThreadBind(&runDestroyBridgeTask,
|
| - crossThreadUnretained(bridgePtr), nullptr));
|
| + location,
|
| + crossThreadBind(&runDestroyBridgeTask, crossThreadUnretained(bridgePtr),
|
| + nullptr));
|
| }
|
|
|
| void postAndWaitDestroyBridgeTask(const WebTraceLocation& location,
|
| @@ -526,8 +528,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationLifeCycle)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -578,8 +581,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationReEntry)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -641,8 +645,9 @@ TEST_F(Canvas2DLayerBridgeTest,
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -715,8 +720,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_BackgroundRenderingWhileHibernating)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -783,8 +789,9 @@ TEST_F(
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -854,8 +861,9 @@ TEST_F(Canvas2DLayerBridgeTest,
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -921,8 +929,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_TeardownWhileHibernating)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -964,8 +973,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_SnapshotWhileHibernating)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -1026,8 +1036,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_TeardownWhileHibernationIsPending)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationScheduledEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true,
|
| hibernationScheduledEvent.get());
|
| postDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
|
| @@ -1073,8 +1084,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToPendingTeardown)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(
|
| *mockLoggerPtr,
|
| reportHibernationEvent(
|
| @@ -1083,8 +1095,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToPendingTeardown)
|
| &WaitableEvent::signal));
|
| postSetIsHiddenTask(BLINK_FROM_HERE, testThread.get(), bridge.get(), true);
|
| testThread->getWebTaskRunner()->postTask(
|
| - BLINK_FROM_HERE, crossThreadBind(&Canvas2DLayerBridge::beginDestruction,
|
| - crossThreadUnretained(bridge.get())));
|
| + BLINK_FROM_HERE,
|
| + crossThreadBind(&Canvas2DLayerBridge::beginDestruction,
|
| + crossThreadUnretained(bridge.get())));
|
| hibernationAbortedEvent->wait();
|
|
|
| ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
|
| @@ -1118,8 +1131,9 @@ TEST_F(Canvas2DLayerBridgeTest,
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr,
|
| reportHibernationEvent(
|
| Canvas2DLayerBridge::HibernationAbortedDueToVisibilityChange))
|
| @@ -1163,8 +1177,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_HibernationAbortedDueToLostContext)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationAbortedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr,
|
| reportHibernationEvent(
|
| Canvas2DLayerBridge::HibernationAbortedDueGpuContextLoss))
|
| @@ -1204,8 +1219,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_PrepareMailboxWhileHibernating)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
| @@ -1252,8 +1268,9 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_PrepareMailboxWhileBackgroundRendering)
|
| // Test entering hibernation
|
| std::unique_ptr<WaitableEvent> hibernationStartedEvent =
|
| WTF::makeUnique<WaitableEvent>();
|
| - EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(
|
| - Canvas2DLayerBridge::HibernationScheduled));
|
| + EXPECT_CALL(
|
| + *mockLoggerPtr,
|
| + reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
|
| EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
|
| .WillOnce(testing::Invoke(hibernationStartedEvent.get(),
|
| &WaitableEvent::signal));
|
|
|