Deliver IPC messages together with SwapCompositorFrame

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 04abdc0c69de4d742c0629fadc43f96c102aa0be..8889d17b1b2b858471858e05be00722193a1610c 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -13,6 +13,7 @@
 #include "cc/output/software_output_device.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/renderer/gpu/frame_swap_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 +67,8 @@ class SynchronousCompositorOutputSurface::SoftwareDevice
 };
 
 SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
-    int routing_id)
+    int routing_id,
+    scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue)
     : cc::OutputSurface(
           scoped_ptr<cc::SoftwareOutputDevice>(new SoftwareDevice(this))),
       routing_id_(routing_id),
@@ -76,6 +78,7 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(
       current_sw_canvas_(NULL),
       memory_policy_(0),
       output_surface_client_(NULL),
+      frame_swap_message_queue_(frame_swap_message_queue),
       weak_ptr_factory_(this) {
   capabilities_.deferred_gl_initialization = true;
   capabilities_.draw_and_swap_full_viewport_every_frame = true;
@@ -144,6 +147,23 @@ void SynchronousCompositorOutputSurface::SwapBuffers(
 
   did_swap_buffer_ = true;
   client_->DidSwapBuffers();
+
+  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_to_deliver_with_frame);
+    if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+      BrowserThread::PostTask(
+          BrowserThread::UI,
+          FROM_HERE,
+          base::Bind(&SynchronousCompositorOutputSurface::DeliverMessages,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     messages_to_deliver_with_frame));
+      return;
+    }
+  }
+  DeliverMessages(messages_to_deliver_with_frame);
 }
 
 void SynchronousCompositorOutputSurface::UpdateFrameMetaData(
@@ -163,6 +183,14 @@ void SynchronousCompositorOutputSurface::UpdateFrameMetaData(
     delegate->UpdateFrameMetaData(frame_info);
 }
 
+void SynchronousCompositorOutputSurface::DeliverMessages(
+    const std::vector<IPC::Message>& messages) {
+  DCHECK(CalledOnValidThread());
+  SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
+  if (delegate)
+    delegate->DeliverMessages(messages);
+}
+
 namespace {
 void AdjustTransform(gfx::Transform* transform, gfx::Rect viewport) {
   // CC's draw origin starts at the viewport.