Move VISUAL_STATE promise to activation

content/renderer/gpu/frame_swap_message_queue.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 <limits>
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
@@ skipping 128 matching lines @@
 }
 
 void FrameSwapMessageQueue::QueueMessageForFrame(MessageDeliveryPolicy policy,
                                                  int source_frame_number,
                                                  scoped_ptr<IPC::Message> msg,
                                                  bool* is_first) {
   base::AutoLock lock(lock_);
   GetSubQueue(policy)->QueueMessage(source_frame_number, msg.Pass(), is_first);
 }
 
+void FrameSwapMessageQueue::DidActivate(int source_frame_number) {
+  base::AutoLock lock(lock_);
+  visual_state_queue_->DrainMessages(source_frame_number,
+                                     &next_drain_messages_);
+}
+
 void FrameSwapMessageQueue::DidSwap(int source_frame_number) {
   base::AutoLock lock(lock_);
-
-  visual_state_queue_->DrainMessages(source_frame_number,
-                                     &next_drain_messages_);
+  swap_queue_->DrainMessages(0, &next_drain_messages_);
 }
 
 void FrameSwapMessageQueue::DidNotSwap(int source_frame_number,
                                        cc::SwapPromise::DidNotSwapReason reason,
                                        ScopedVector<IPC::Message>* messages) {
   base::AutoLock lock(lock_);
   switch (reason) {
     case cc::SwapPromise::SWAP_FAILS:
     case cc::SwapPromise::COMMIT_NO_UPDATE:
       swap_queue_->DrainMessages(source_frame_number, messages);
       visual_state_queue_->DrainMessages(source_frame_number, messages);
       break;
     case cc::SwapPromise::COMMIT_FAILS:
+    case cc::SwapPromise::ACTIVATION_FAILS:
       // Do not queue any responses here.
       // If COMMIT_FAILS the renderer is shutting down, which will

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

Is the comment still true for ACTIVATION_FAILS?
If yes, can you fix the comment?
If no, is there something else we need to do?

       // result in the RenderFrameHostImpl destructor firing the
       // remaining response callbacks itself.
       break;
-    default:
-      NOTREACHED();
   }
 }
 
 void FrameSwapMessageQueue::DrainMessages(
     ScopedVector<IPC::Message>* messages) {
   lock_.AssertAcquired();
-
-  swap_queue_->DrainMessages(0, messages);
   messages->insert(messages->end(),
                    next_drain_messages_.begin(),
                    next_drain_messages_.end());
   next_drain_messages_.weak_clear();
 }
 
 scoped_ptr<FrameSwapMessageQueue::SendMessageScope>
 FrameSwapMessageQueue::AcquireSendMessageScope() {
   return make_scoped_ptr(new SendMessageScopeImpl(&lock_));
 }
 
 // static
 void FrameSwapMessageQueue::TransferMessages(ScopedVector<IPC::Message>& source,
                                              vector<IPC::Message>* dest) {
   for (vector<IPC::Message*>::iterator i = source.begin(); i != source.end();
        ++i) {
     IPC::Message* m(*i);
     dest->push_back(*m);
     delete m;
   }
   source.weak_clear();
 }
 
 }  // namespace content