Move VISUAL_STATE promise to activation

content/browser/android/in_process/synchronous_compositor_impl.cc

Index: content/browser/android/in_process/synchronous_compositor_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.cc b/content/browser/android/in_process/synchronous_compositor_impl.cc
index f8701c1a00af71945d2af9cb96164ffda94dc0ef..4f1c8e4fb546865e8d21f5f15ec23bb37c3ed716 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -209,7 +209,7 @@ void SynchronousCompositorImpl::UpdateFrameMetaData(
       contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SynchronousFrameMetadata(frame_metadata);
-  DeliverMessages();
+  DeliverSwapMessages();
 }
 
 void SynchronousCompositorImpl::SetMemoryPolicy(size_t bytes_limit) {
@@ -298,9 +298,8 @@ InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
       contents_->GetRoutingID(), input_event);
 }
 
-void SynchronousCompositorImpl::DeliverMessages() {
-  ScopedVector<IPC::Message> messages;
-  output_surface_->GetMessagesToDeliver(&messages);
+void SynchronousCompositorImpl::DeliverMessagesToRenderProcessHost(
+    const ScopedVector<IPC::Message>& messages) {
   RenderProcessHost* rph = contents_->GetRenderProcessHost();
   for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
        i != messages.end();
@@ -309,6 +308,12 @@ void SynchronousCompositorImpl::DeliverMessages() {
   }
 }
 
+void SynchronousCompositorImpl::DeliverSwapMessages() {
+  ScopedVector<IPC::Message> messages;
+  output_surface_->GetSwapMessagesToDeliver(&messages);
+  DeliverMessagesToRenderProcessHost(messages);
+}
+
 void SynchronousCompositorImpl::DidActivatePendingTree() {
   if (compositor_client_)
     compositor_client_->DidUpdateContent();