summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/platform/graphics
diff options
context:
space:
mode:
authorjunov <junov@chromium.org>2015-12-15 13:28:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-15 21:30:09 +0000
commit8386f2d54fd8f9f62047b6002d3c9743ab3bcfeb (patch)
treec0be561cfb27b665230d63bb8ddef6f72afd2a84 /third_party/WebKit/Source/platform/graphics
parentbdad68b726dd0c294f035e02d3836629ee5d144f (diff)
downloadchromium_src-8386f2d54fd8f9f62047b6002d3c9743ab3bcfeb.zip
chromium_src-8386f2d54fd8f9f62047b6002d3c9743ab3bcfeb.tar.gz
chromium_src-8386f2d54fd8f9f62047b6002d3c9743ab3bcfeb.tar.bz2
Add unit test for disabling deferred canvas rendering while hibernating
Crash was already inavertently fixed by https://codereview.chromium.org/1520123002/ This change adds a test that would have caught the crash in the first place. BUG=568583 Review URL: https://codereview.chromium.org/1527023002 Cr-Commit-Position: refs/heads/master@{#365326}
Diffstat (limited to 'third_party/WebKit/Source/platform/graphics')
-rw-r--r--third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp60
1 files changed, 59 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
index 64cb48f..859b612 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -646,7 +646,6 @@ TEST_F(Canvas2DLayerBridgeTest, BackgroundRenderingWhileHibernatingWithDeferredR
bridge->setImageBuffer(&mockImageBuffer);
bridge->disableDeferral();
-
// Register an alternate Logger for tracking hibernation events
OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
MockLogger* mockLoggerPtr = mockLogger.get();
@@ -693,6 +692,65 @@ TEST_F(Canvas2DLayerBridgeTest, BackgroundRenderingWhileHibernatingWithDeferredR
bridgeDestroyedEvent->wait();
}
+TEST_F(Canvas2DLayerBridgeTest, DisableDeferredRenderingWhileHibernating)
+{
+ MockCanvasContext mainMock;
+ OwnPtr<WebThread> testThread = adoptPtr(Platform::current()->createThread("TestThread"));
+
+ // The Canvas2DLayerBridge has to be created on the thread that will use it
+ // to avoid WeakPtr thread check issues.
+ Canvas2DLayerBridgePtr bridge;
+ OwnPtr<WebWaitableEvent> bridgeCreatedEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ testThread->taskRunner()->postTask(BLINK_FROM_HERE, new CreateBridgeTask(&bridge, &mainMock, this, bridgeCreatedEvent.get()));
+ bridgeCreatedEvent->wait();
+ MockImageBuffer mockImageBuffer;
+ EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AnyNumber());
+ bridge->setImageBuffer(&mockImageBuffer);
+
+ // Register an alternate Logger for tracking hibernation events
+ OwnPtr<MockLogger> mockLogger = adoptPtr(new MockLogger);
+ MockLogger* mockLoggerPtr = mockLogger.get();
+ bridge->setLoggerForTesting(mockLogger.release());
+
+ // Test entering hibernation
+ OwnPtr<WebWaitableEvent> hibernationStartedEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(Canvas2DLayerBridge::HibernationScheduled));
+ EXPECT_CALL(*mockLoggerPtr, didStartHibernating())
+ .WillOnce(testing::Invoke(hibernationStartedEvent.get(), &WebWaitableEvent::signal));
+ testThread->taskRunner()->postTask(BLINK_FROM_HERE, new SetIsHiddenTask(bridge.get(), true));
+ hibernationStartedEvent->wait();
+ ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
+ ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
+ EXPECT_FALSE(bridge->isAccelerated());
+ EXPECT_TRUE(bridge->isHibernating());
+
+ // Disable deferral while background rendering
+ EXPECT_CALL(*mockLoggerPtr, reportHibernationEvent(Canvas2DLayerBridge::HibernationEndedWithSwitchToBackgroundRendering));
+ EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AtLeast(1));
+ bridge->disableDeferral();
+ ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
+ ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
+ EXPECT_FALSE(bridge->isAccelerated());
+ EXPECT_FALSE(bridge->isHibernating());
+
+ // Unhide
+ EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AtLeast(1));
+ OwnPtr<WebWaitableEvent> unhideEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ testThread->taskRunner()->postTask(BLINK_FROM_HERE, new SetIsHiddenTask(bridge.get(), false, unhideEvent.get()));
+ unhideEvent->wait();
+ ::testing::Mock::VerifyAndClearExpectations(mockLoggerPtr);
+ ::testing::Mock::VerifyAndClearExpectations(&mockImageBuffer);
+ EXPECT_TRUE(bridge->isAccelerated()); // Becoming visible causes switch back to GPU
+ EXPECT_FALSE(bridge->isHibernating());
+
+ // Tear down the bridge on the thread so that 'bridge' can go out of scope
+ // without crashing due to thread checks
+ EXPECT_CALL(mockImageBuffer, resetCanvas(_)).Times(AnyNumber());
+ OwnPtr<WebWaitableEvent> bridgeDestroyedEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ testThread->taskRunner()->postTask(BLINK_FROM_HERE, new DestroyBridgeTask(&bridge, bridgeDestroyedEvent.get()));
+ bridgeDestroyedEvent->wait();
+}
+
TEST_F(Canvas2DLayerBridgeTest, TeardownWhileHibernating)
{
MockCanvasContext mainMock;