Move VISUAL_STATE promise to activation

content/renderer/gpu/frame_swap_message_queue_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
@@ skipping 29 matching lines @@
                                bool* first) {
     queue_->QueueMessageForFrame(MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE,
                                  source_frame_number,
                                  msg.Pass(),
                                  first);
   }
 
   void DrainMessages(int source_frame_number,
                      ScopedVector<IPC::Message>* messages) {
     messages->clear();
+    queue_->DidActivate(source_frame_number);
     queue_->DidSwap(source_frame_number);
     scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
         queue_->AcquireSendMessageScope();
     queue_->DrainMessages(messages);
   }
 
   bool HasMessageForId(const ScopedVector<IPC::Message>& messages,
                        int routing_id) {
     for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
          i != messages.end();
@@ skipping 25 matching lines @@
 
 TEST_F(FrameSwapMessageQueueTest, TestEmpty) {
   ScopedVector<IPC::Message> messages;
   ASSERT_TRUE(queue_->Empty());
   QueueNextSwapMessage(CloneMessage(first_message_));
   ASSERT_FALSE(queue_->Empty());
   DrainMessages(0, &messages);
   ASSERT_TRUE(queue_->Empty());
   QueueVisualStateMessage(1, CloneMessage(first_message_));
   ASSERT_FALSE(queue_->Empty());
+  queue_->DidActivate(1);
   queue_->DidSwap(1);
   ASSERT_FALSE(queue_->Empty());
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestQueueMessageFirst) {
   ScopedVector<IPC::Message> messages;
   bool visual_state_first = false;
   bool next_swap_first = false;
 
   // Queuing the first time should result in true.
@@ skipping 97 matching lines @@
 }
 
 void FrameSwapMessageQueueTest::TestDidNotSwap(
     cc::SwapPromise::DidNotSwapReason reason) {
   ScopedVector<IPC::Message> messages;
 
   QueueNextSwapMessage(CloneMessage(first_message_));
   QueueVisualStateMessage(2, CloneMessage(second_message_));
   QueueVisualStateMessage(3, CloneMessage(third_message_));
 
-  queue_->DidNotSwap(2, cc::SwapPromise::COMMIT_NO_UPDATE, &messages);
-  ASSERT_EQ(2u, messages.size());
-  ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
-  ASSERT_TRUE(HasMessageForId(messages, second_message_.routing_id()));
+  bool msg_delivered = reason != cc::SwapPromise::COMMIT_FAILS &&
+                       reason != cc::SwapPromise::ACTIVATION_FAILS;
+
+  queue_->DidNotSwap(2, reason, &messages);
+  ASSERT_TRUE(msg_delivered == HasMessageForId(messages, first_message_.routing_id()));

[boliu, 2015/05/14 14:40:21]

80 char / line

[Tobias Sargeant, 2015/05/14 21:40:48]

Done.

+  ASSERT_TRUE(msg_delivered == HasMessageForId(messages, second_message_.routing_id()));
+  ASSERT_FALSE(HasMessageForId(messages, third_message_.routing_id()));
   messages.clear();
 
-  queue_->DidNotSwap(3, cc::SwapPromise::COMMIT_NO_UPDATE, &messages);
-  ASSERT_EQ(1u, messages.size());
-  ASSERT_TRUE(HasMessageForId(messages, third_message_.routing_id()));
+  queue_->DidNotSwap(3, reason, &messages);
+  ASSERT_FALSE(HasMessageForId(messages, first_message_.routing_id()));
+  ASSERT_FALSE(HasMessageForId(messages, second_message_.routing_id()));
+  ASSERT_TRUE(msg_delivered == HasMessageForId(messages, third_message_.routing_id()));
   messages.clear();
+
+  // all undelivered messages should still be available for RenderFrameHostImpl
+  // to deliver.
+  DrainMessages(3, &messages);
+  ASSERT_TRUE(msg_delivered != HasMessageForId(messages, first_message_.routing_id()));
+  ASSERT_TRUE(msg_delivered != HasMessageForId(messages, second_message_.routing_id()));
+  ASSERT_TRUE(msg_delivered != HasMessageForId(messages, third_message_.routing_id()));
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapNoUpdate) {
   TestDidNotSwap(cc::SwapPromise::COMMIT_NO_UPDATE);
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapSwapFails) {
   TestDidNotSwap(cc::SwapPromise::SWAP_FAILS);

[boliu, 2015/05/14 14:40:22]

In theory, SWAP_FAILS has to come after DidActivate. It's just we are not
DCHECKing that right now.

[Tobias Sargeant, 2015/05/14 21:40:48]

Acknowledged.

 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapCommitFails) {
-  ScopedVector<IPC::Message> messages;
+  TestDidNotSwap(cc::SwapPromise::COMMIT_FAILS);
+}
 
-  QueueNextSwapMessage(CloneMessage(first_message_));
-  QueueVisualStateMessage(2, CloneMessage(second_message_));
-  QueueVisualStateMessage(3, CloneMessage(third_message_));
-
-  queue_->DidNotSwap(2, cc::SwapPromise::COMMIT_FAILS, &messages);
-  ASSERT_EQ(0u, messages.size());
-  messages.clear();
-
-  queue_->DidNotSwap(3, cc::SwapPromise::COMMIT_FAILS, &messages);
-  ASSERT_EQ(0u, messages.size());
-  messages.clear();
-
-  DrainMessages(1, &messages);
-  ASSERT_EQ(1u, messages.size());
-  ASSERT_TRUE(HasMessageForId(messages, first_message_.routing_id()));
+TEST_F(FrameSwapMessageQueueTest, TestDidNotSwapActivationFails) {
+  TestDidNotSwap(cc::SwapPromise::ACTIVATION_FAILS);
 }
 
 class NotifiesDeletionMessage : public IPC::Message {
  public:
   NotifiesDeletionMessage(bool* deleted, const IPC::Message& other)
       : IPC::Message(other), deleted_(deleted) {}
   ~NotifiesDeletionMessage() override { *deleted_ = true; }
 
  private:
   bool* deleted_;
@@ skipping 14 matching lines @@
                               &message_deleted, first_message_)));
   queue_ = NULL;
   ASSERT_TRUE(message_deleted);
 }
 
 TEST_F(FrameSwapMessageQueueTest, TestDeletesQueuedVisualStateMessage) {
   bool message_deleted = false;
   QueueVisualStateMessage(1,
                           make_scoped_ptr(new NotifiesDeletionMessage(
                               &message_deleted, first_message_)));
+  queue_->DidActivate(1);
   queue_->DidSwap(1);
   queue_ = NULL;
   ASSERT_TRUE(message_deleted);
 }
 
 }  // namespace content