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 169 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);
 }

[piman, 2015/05/13 22:47:15]

Can you add more tests for the new conditions?

 
 }  // namespace content