Content Renderer FrameSwapMessageQueue: Fix DidActivate with DidNotSwap.

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 <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 158 matching lines @@
 }
 
 void FrameSwapMessageQueue::DidNotSwap(
     int source_frame_number,
     cc::SwapPromise::DidNotSwapReason reason,
     std::vector<std::unique_ptr<IPC::Message>>* messages) {
   base::AutoLock lock(lock_);
   switch (reason) {
     case cc::SwapPromise::SWAP_FAILS:
     case cc::SwapPromise::COMMIT_NO_UPDATE:
+      DrainMessages(messages);
       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 ACTIVATION_FAILS or
       // COMMIT_FAILS the renderer is shutting down, which will result
       // in the RenderFrameHostImpl destructor firing the remaining
       // response callbacks itself.
       break;
@@ skipping 17 matching lines @@
 void FrameSwapMessageQueue::TransferMessages(
     std::vector<std::unique_ptr<IPC::Message>>* source,
     vector<IPC::Message>* dest) {
   for (const auto& msg : *source) {
     dest->push_back(*msg.get());
   }
   source->clear();
 }
 
 }  // namespace content