Move VISUAL_STATE promise to activation

content/renderer/gpu/compositor_output_surface.cc

Index: content/renderer/gpu/compositor_output_surface.cc
diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc
index bdeefe0a8fc98208ccd3b0deea0e018a61cb0c64..918d0bce0c9d2231060ae632c8e46ba8f7e4a7ca 100644
--- a/content/renderer/gpu/compositor_output_surface.cc
+++ b/content/renderer/gpu/compositor_output_surface.cc
@@ -15,7 +15,7 @@
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
-#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "content/renderer/gpu/frame_update_message_queue.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ -35,7 +35,7 @@ CompositorOutputSurface::CompositorOutputSurface(
     const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
     scoped_ptr<cc::SoftwareOutputDevice> software_device,
-    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
+    scoped_refptr<FrameUpdateMessageQueue> swap_frame_message_queue,
     bool use_swap_compositor_frame_message)
     : OutputSurface(context_provider,
                     worker_context_provider,
@@ -44,7 +44,7 @@ CompositorOutputSurface::CompositorOutputSurface(
       use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
       output_surface_filter_(
           RenderThreadImpl::current()->compositor_message_filter()),
-      frame_swap_message_queue_(swap_frame_message_queue),
+      frame_update_message_queue_(swap_frame_message_queue),
       routing_id_(routing_id),
       prefers_smoothness_(false),
 #if defined(OS_WIN)
@@ -56,7 +56,7 @@ CompositorOutputSurface::CompositorOutputSurface(
       layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
       weak_ptrs_(this) {
   DCHECK(output_surface_filter_.get());
-  DCHECK(frame_swap_message_queue_.get());
+  DCHECK(frame_update_message_queue_.get());
   DetachFromThread();
   message_sender_ = RenderThreadImpl::current()->sync_message_filter();
   DCHECK(message_sender_.get());
@@ -154,11 +154,11 @@ void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
     {
       ScopedVector<IPC::Message> messages;
       std::vector<IPC::Message> messages_to_deliver_with_frame;
-      scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
-          frame_swap_message_queue_->AcquireSendMessageScope();
-      frame_swap_message_queue_->DrainMessages(&messages);
-      FrameSwapMessageQueue::TransferMessages(messages,
-                                              &messages_to_deliver_with_frame);
+      scoped_ptr<FrameUpdateMessageQueue::SendMessageScope> send_message_scope =
+          frame_update_message_queue_->AcquireSendMessageScope();
+      frame_update_message_queue_->DrainMessagesForSwap(&messages);
+      FrameUpdateMessageQueue::TransferMessages(
+          messages, &messages_to_deliver_with_frame);
       Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
                                                output_surface_id_,
                                                *frame,