Deliver IPC messages together with SwapCompositorFrame

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 d7b3eb7a21469f586a93d35a3dceedf72c4cd8dc..531cf1c28d5a7574f320737ca0992d35dbf6341b 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_impl.cc
@@ -127,6 +127,7 @@ scoped_ptr<cc::CompositorFrame> SynchronousCompositorImpl::DemandDrawHw(
       output_surface_->DemandDrawHw(surface_size, transform, viewport, clip);
   if (frame.get())
     UpdateFrameMetaData(frame->metadata);
+
   return frame.Pass();
 }
 
@@ -152,6 +153,7 @@ void SynchronousCompositorImpl::UpdateFrameMetaData(
       contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SynchronousFrameMetadata(frame_metadata);
+  DeliverMessages();
 }
 
 void SynchronousCompositorImpl::SetMemoryPolicy(
@@ -231,6 +233,17 @@ InputEventAckState SynchronousCompositorImpl::HandleInputEvent(
       contents_->GetRoutingID(), input_event);
 }
 
+void SynchronousCompositorImpl::DeliverMessages() {
+  ScopedVector<IPC::Message> messages;
+  output_surface_->GetMessagesToDeliver(&messages);
+  RenderProcessHost* rph = contents_->GetRenderProcessHost();
+  for (ScopedVector<IPC::Message>::const_iterator i = messages.begin();
+       i != messages.end();
+       ++i) {
+    rph->OnMessageReceived(**i);
+  }
+}
+
 void SynchronousCompositorImpl::DidActivatePendingTree() {
   if (compositor_client_)
     compositor_client_->DidUpdateContent();