Deliver IPC messages together with SwapCompositorFrame

content/browser/android/in_process/synchronous_compositor_output_surface.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
 #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"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 namespace content {
 
 namespace {
@@ skipping 33 matching lines @@
   }
 
  private:
   SynchronousCompositorOutputSurface* surface_;
   SkCanvas null_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(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),
       needs_begin_frame_(false),
       invoking_composite_(false),
       did_swap_buffer_(false),
       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;
   capabilities_.adjust_deadline_for_parent = false;
   // Cannot call out to GetDelegate() here as the output surface is not
   // constructed on the correct thread.
 
   memory_policy_.priority_cutoff_when_visible =
       gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
 }
@@ skipping 48 matching lines @@
     cc::CompositorFrame* frame) {
   DCHECK(CalledOnValidThread());
   if (!ForcedDrawToSoftwareDevice()) {
     DCHECK(context_provider_);
     context_provider_->ContextGL()->ShallowFlushCHROMIUM();
   }
   UpdateFrameMetaData(frame->metadata);
 
   did_swap_buffer_ = true;
   client_->DidSwapBuffers();
+
+  // We don't care about the SendMessageScope since we're already on the UI

[boliu, 2014/05/23 06:27:00]

This might not be UI in webview until we turn on ubercomp on latest android.

[mkosiba (inactive), 2014/05/23 15:50:38]

What?! Then the DCHECK(CalledOnValidThread()); on Line 141 is super-misleading.

I'll refactor this to be a post to the UI thread (like UpdateFrameMetaData is).

+  // thread.
+  std::vector<IPC::Message> messages_to_deliver_with_frame;
+  frame_swap_message_queue_->DrainMessages(client_->GetSourceFrameNumber(),

[boliu, 2014/05/23 06:27:00]

Should the SourceFrameNumber be part of CompositorFrame, ie
CompositorFrameMetadata?

[mkosiba (inactive), 2014/05/23 15:50:38]

Don't need it at all now.

+                                           &messages_to_deliver_with_frame);
+  SynchronousCompositorOutputSurfaceDelegate* delegate = GetDelegate();
+  if (delegate)
+    delegate->DeliverMessages(messages_to_deliver_with_frame);
 }
 
 void SynchronousCompositorOutputSurface::UpdateFrameMetaData(
     const cc::CompositorFrameMetadata& frame_info) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&SynchronousCompositorOutputSurface::UpdateFrameMetaData,
                    weak_ptr_factory_.GetWeakPtr(),
@@ skipping 118 matching lines @@
 bool SynchronousCompositorOutputSurface::CalledOnValidThread() const {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }
 
 SynchronousCompositorOutputSurfaceDelegate*
 SynchronousCompositorOutputSurface::GetDelegate() {
   return SynchronousCompositorImpl::FromRoutingID(routing_id_);
 }
 
 }  // namespace content