Aura: Browser-side changes for Composite-To-Mailbox

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index bceb702cfeb4c991d2501f2ec1ad72a6458b355d..f5ab42fd4b5f036a156c0738c6e4085bb1511385 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -17,7 +17,7 @@
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "cc/compositor_frame.h"
+#include "cc/switches.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
@@ -1536,6 +1536,8 @@ void RenderWidgetHostImpl::OnSwapCompositorFrame(
         frame.metadata.location_bar_content_translation);
   }
 #endif
+  if (view_)
+    view_->OnSwapCompositorFrame(frame, process_->GetID(), routing_id_);

[piman, 2013/02/27 01:07:13]

We need to send an Ack if we have no view, otherwise the renderer will block.

[no sievers, 2013/02/27 21:07:40]

Done.

 }
 
 void RenderWidgetHostImpl::OnUpdateRect(
@@ -2335,6 +2337,14 @@ void RenderWidgetHostImpl::AcknowledgeBufferPresent(
   }
 }
 
+// static
+void RenderWidgetHostImpl::SendSwapCompositorFrameAck(
+    int32 route_id, int renderer_host_id, const cc::CompositorFrameAck& ack) {
+  RenderProcessHost* host = RenderProcessHost::FromID(renderer_host_id);
+  if (host)
+    host->Send(new ViewMsg_SwapCompositorFrameAck(route_id, ack));
+}
+
 void RenderWidgetHostImpl::AcknowledgeSwapBuffersToRenderer() {
   if (!is_threaded_compositing_enabled_)
     Send(new ViewMsg_SwapBuffers_ACK(routing_id_));