Move VISUAL_STATE promise to activation

content/browser/android/in_process/synchronous_compositor_output_surface.cc

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index a94c705d21627dd6e8f0d25f3481695715ddccbb..bfe7ff74b22bc47e01127f1049cf0dc4cb558d56 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -15,7 +15,7 @@
 #include "content/browser/android/in_process/synchronous_compositor_registry.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/renderer/gpu/frame_swap_message_queue.h"
+#include "content/renderer/gpu/frame_update_message_queue.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -66,7 +66,7 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
     const scoped_refptr<cc::ContextProvider>& context_provider,
     const scoped_refptr<cc::ContextProvider>& worker_context_provider,
     int routing_id,
-    scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue)
+    scoped_refptr<FrameUpdateMessageQueue> frame_update_message_queue)
     : cc::OutputSurface(
           context_provider,
           worker_context_provider,
@@ -75,7 +75,7 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
       registered_(false),
       current_sw_canvas_(nullptr),
       memory_policy_(0),
-      frame_swap_message_queue_(frame_swap_message_queue) {
+      frame_update_message_queue_(frame_update_message_queue) {
   capabilities_.draw_and_swap_full_viewport_every_frame = true;
   capabilities_.adjust_deadline_for_parent = false;
   capabilities_.delegated_rendering = true;
@@ -259,12 +259,16 @@ void SynchronousCompositorOutputSurface::SetTreeActivationCallback(
   client_->SetTreeActivationCallback(callback);
 }
 
-void SynchronousCompositorOutputSurface::GetMessagesToDeliver(
+void SynchronousCompositorOutputSurface::GetSwapMessagesToDeliver(
     ScopedVector<IPC::Message>* messages) {
+  // called by
+  //   SynchronousCompositorImpl::UpdateFrameMetaData (on swap) ->
+  //     SynchronousCompositorImpl::DeliverMessages ->
+  //       GetSwapMessagesToDeliver
   DCHECK(CalledOnValidThread());
-  scoped_ptr<FrameSwapMessageQueue::SendMessageScope> send_message_scope =
-      frame_swap_message_queue_->AcquireSendMessageScope();
-  frame_swap_message_queue_->DrainMessages(messages);
+  scoped_ptr<FrameUpdateMessageQueue::SendMessageScope> send_message_scope =
+      frame_update_message_queue_->AcquireSendMessageScope();
+  frame_update_message_queue_->DrainMessagesForSwap(messages);
 }
 
 // Not using base::NonThreadSafe as we want to enforce a more exacting threading