Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1266)

Unified Diff: content/renderer/gpu/queue_message_swap_promise_unittest.cc

Issue 974483002: [WebView] Remove onFailure from VisualStateCallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/frame_swap_message_queue_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/queue_message_swap_promise_unittest.cc
diff --git a/content/renderer/gpu/queue_message_swap_promise_unittest.cc b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
index c79a6dfe23d2edfeab6774578dba616a1a520c55..7590490f5c830e114ab50bf5e392ccef11acca2f 100644
--- a/content/renderer/gpu/queue_message_swap_promise_unittest.cc
+++ b/content/renderer/gpu/queue_message_swap_promise_unittest.cc
@@ -294,8 +294,34 @@ TEST_F(QueueMessageSwapPromiseTest, VisalStateSwapPromiseDidNotSwapNoUpdate) {
}
TEST_F(QueueMessageSwapPromiseTest,
- VisalStateSwapPromiseDidNotSwapCommitFails) {
- VisualStateSwapPromiseDidNotSwap(cc::SwapPromise::COMMIT_FAILS);
+ VisualStateSwapPromiseDidNotSwapCommitFails) {
+ // COMMIT_FAILS is treated differently:
+ // If we fail to swap with COMMIT_FAILS, then the renderer is
+ // shutting down, which implies that the RenderFrameHostImpl
+ // destructor will eventually be called, firing the remaining
+ // response callbacks (with swap_success = false) itself.
+ QueueMessageData data[] = {
+ /* { policy, source_frame_number } */
+ {MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE, 1},
+ {MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE, 1},
+ {MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE, 2},
+ };
+ QueueMessages(data, arraysize(data));
+
+ promises_[0]->DidNotSwap(cc::SwapPromise::COMMIT_FAILS);
+ ASSERT_FALSE(promises_[1]);
+ EXPECT_TRUE(NextSwapMessages().empty());
+ EXPECT_EQ(0u, DirectSendMessages().size());
+ EXPECT_FALSE(ContainsMessage(DirectSendMessages(), messages_[0]));
+ EXPECT_FALSE(ContainsMessage(DirectSendMessages(), messages_[1]));
+ EXPECT_FALSE(ContainsMessage(DirectSendMessages(), messages_[2]));
+
+ promises_[2]->DidNotSwap(cc::SwapPromise::COMMIT_FAILS);
+ EXPECT_TRUE(NextSwapMessages().empty());
+ EXPECT_FALSE(ContainsMessage(DirectSendMessages(), messages_[2]));
+
+ EXPECT_TRUE(NextSwapMessages().empty());
+ EXPECT_FALSE(frame_swap_message_queue_->Empty());
}
TEST_F(QueueMessageSwapPromiseTest, VisalStateSwapPromiseDidNotSwapSwapFails) {
« no previous file with comments | « content/renderer/gpu/frame_swap_message_queue_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698