Prepare for webview compositing on MACOSX.

We need to ACK buffers different when threaded compositing
is not turned on.

BUG=143429

Review URL: https://chromiumcodereview.appspot.com/12193021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181375 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 65 insertions, 15 deletions

diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc
index 4ffaa3d..7031f47 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.cc
+++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -249,7 +249,7 @@ bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginDestroyed,
                         OnPluginDestroyed)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_BuffersSwappedACK,
-                        OnSwapBuffersACK)
+                        OnUnhandledSwapBuffersACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -305,6 +305,7 @@ void BrowserPluginEmbedder::WebContentsVisibilityChanged(bool visible) {
 bool BrowserPluginEmbedder::ShouldForwardToBrowserPluginGuest(
     const IPC::Message& message) {
   switch (message.type()) {
+    case BrowserPluginHostMsg_BuffersSwappedACK::ID:
     case BrowserPluginHostMsg_DragStatusUpdate::ID:
     case BrowserPluginHostMsg_Go::ID:
     case BrowserPluginHostMsg_HandleInputEvent::ID:
@@ -359,16 +360,18 @@ void BrowserPluginEmbedder::OnPluginDestroyed(int instance_id) {
   DestroyGuestByInstanceID(instance_id);
 }
 
-void BrowserPluginEmbedder::OnSwapBuffersACK(int route_id,
-                                             int gpu_host_id,
-                                             const std::string& mailbox_name,
-                                             uint32 sync_point) {
-  AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
-  ack_params.mailbox_name = mailbox_name;
-  ack_params.sync_point = sync_point;
-  RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
-                                                 gpu_host_id,
-                                                 ack_params);
+// We only get here during teardown if we have one last buffer pending,
+// otherwise the ACK is handled by the guest.
+void BrowserPluginEmbedder::OnUnhandledSwapBuffersACK(
+    int instance_id,
+    int route_id,
+    int gpu_host_id,
+    const std::string& mailbox_name,
+    uint32 sync_point) {
+  BrowserPluginGuest::AcknowledgeBufferPresent(route_id,
+                                               gpu_host_id,
+                                               mailbox_name,
+                                               sync_point);
 }
 
 }  // namespace content
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index b845007..fe0e041 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -126,10 +126,11 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
                                   int request_id,
                                   const gfx::Point& position);
   void OnPluginDestroyed(int instance_id);
-  void OnSwapBuffersACK(int route_id,
-                        int gpu_host_id,
-                        const std::string& mailbox_name,
-                        uint32 sync_point);
+  void OnUnhandledSwapBuffersACK(int instance_id,
+                                 int route_id,
+                                 int gpu_host_id,
+                                 const std::string& mailbox_name,
+                                 uint32 sync_point);
 
   // Static factory instance (always NULL for non-test).
   static BrowserPluginHostFactory* factory_;
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 87ca245..3042c73 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -18,6 +18,7 @@
 #include "content/common/content_constants_internal.h"
 #include "content/common/drag_messages.h"
 #include "content/common/view_messages.h"
+#include "content/common/gpu/gpu_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_service.h"
@@ -69,6 +70,8 @@ bool BrowserPluginGuest::OnMessageReceivedFromEmbedder(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginGuest, message)
+    IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_BuffersSwappedACK,
+                        OnSwapBuffersACK)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_DragStatusUpdate,
                         OnDragStatusUpdate)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_Go, OnGo)
@@ -564,6 +567,35 @@ void BrowserPluginGuest::OnStop(int instance_id) {
   web_contents()->Stop();
 }
 
+void BrowserPluginGuest::AcknowledgeBufferPresent(
+    int route_id,
+    int gpu_host_id,
+    const std::string& mailbox_name,
+    uint32 sync_point) {
+  AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
+  ack_params.mailbox_name = mailbox_name;
+  ack_params.sync_point = sync_point;
+  RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
+                                                 gpu_host_id,
+                                                 ack_params);
+}
+
+void BrowserPluginGuest::OnSwapBuffersACK(int instance_id,
+                                          int route_id,
+                                          int gpu_host_id,
+                                          const std::string& mailbox_name,
+                                          uint32 sync_point) {
+  AcknowledgeBufferPresent(route_id, gpu_host_id, mailbox_name, sync_point);
+
+// This is only relevant on MACOSX and WIN when threaded compositing
+// is not enabled. In threaded mode, above ACK is sufficient.
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  RenderWidgetHostImpl* render_widget_host =
+        RenderWidgetHostImpl::From(web_contents()->GetRenderViewHost());
+  render_widget_host->AcknowledgeSwapBuffersToRenderer();
+#endif  // defined(OS_MACOSX) || defined(OS_WIN)
+}
+
 void BrowserPluginGuest::OnTerminateGuest(int instance_id) {
   RecordAction(UserMetricsAction("BrowserPlugin.Guest.Terminate"));
   base::ProcessHandle process_handle =
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index f0b3039..1d343b1 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -170,6 +170,13 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
   // within an embedder.
   int instance_id() const { return instance_id_; }
 
+  // Allow the embedder to call this for unhandled messages when
+  // BrowserPluginGuest is already destroyed.
+  static void AcknowledgeBufferPresent(int route_id,
+                                       int gpu_host_id,
+                                       const std::string& mailbox_name,
+                                       uint32 sync_point);
+
  private:
   friend class TestBrowserPluginGuest;
 
@@ -247,6 +254,13 @@ class CONTENT_EXPORT BrowserPluginGuest : public NotificationObserver,
   void OnSetVisibility(int instance_id, bool visible);
   // Stop loading the guest. Overriden in tests.
   virtual void OnStop(int instance_id);
+  // Message from embedder acknowledging last HW buffer.
+  void OnSwapBuffersACK(int instance_id,
+                        int route_id,
+                        int gpu_host_id,
+                        const std::string& mailbox_name,
+                        uint32 sync_point);
+
   void OnTerminateGuest(int instance_id);
   void OnUpdateRectACK(
       int instance_id,