Fixes issues when switching between software and compositing.

content/renderer/browser_plugin/browser_plugin_manager_impl.cc

 // Copyright (c) 2012 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/renderer/browser_plugin/browser_plugin_manager_impl.h"
 
 #include "content/common/browser_plugin_messages.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/render_thread_impl.h"
 #include "ui/gfx/point.h"
@@ skipping 31 matching lines @@
     PickleIterator iter(message);
     bool success = iter.ReadInt(&instance_id);
     DCHECK(success);
     BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
     if (plugin && plugin->OnMessageReceived(message))
       return true;
   }
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message)
+    IPC_MESSAGE_HANDLER(BrowserPluginMsg_BuffersSwapped,
+                        OnUnhandledSwap);
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_PluginAtPositionRequest,
                         OnPluginAtPositionRequest);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginManagerImpl::OnPluginAtPositionRequest(
     const IPC::Message& message,
     int request_id,
@@ skipping 15 matching lines @@
     it.Advance();
   }
 
   Send(new BrowserPluginHostMsg_PluginAtPositionResponse(
        source_routing_id,
        instance_id,
        request_id,
        local_position));
 }
 
+void BrowserPluginManagerImpl::OnUnhandledSwap(const IPC::Message& message,
+                                               int instance_id,
+                                               const gfx::Size& size,
+                                               std::string mailbox_name,
+                                               int gpu_route_id,
+                                               int gpu_host_id) {
+  Send(new BrowserPluginHostMsg_BuffersSwappedACK(

[Fady Samuel, 2013/01/16 16:22:22]

Why is this in BrowserPluginManager and not in BrowserPlugin?

[alexst (slow to review), 2013/01/16 16:58:21]

Because the browser plugin is already gone at this point. It's the final buffer
from texture_image_transport_surface and needs to be ACK'd, otherwise it won't
shut down.

On 2013/01/16 16:22:22, Fady Samuel wrote:

+      message.routing_id(),
+      gpu_route_id,
+      gpu_host_id,
+      mailbox_name,
+      0));
+}
+
 // static
 bool BrowserPluginManagerImpl::ShouldForwardToBrowserPlugin(
     const IPC::Message& message) {
   switch (message.type()) {
     case BrowserPluginMsg_AdvanceFocus::ID:
     case BrowserPluginMsg_GuestContentWindowReady::ID:
     case BrowserPluginMsg_GuestGone::ID:
     case BrowserPluginMsg_GuestResponsive::ID:
     case BrowserPluginMsg_GuestUnresponsive::ID:
     case BrowserPluginMsg_LoadAbort::ID:
     case BrowserPluginMsg_LoadCommit::ID:
     case BrowserPluginMsg_LoadRedirect::ID:
     case BrowserPluginMsg_LoadStart::ID:
     case BrowserPluginMsg_LoadStop::ID:
     case BrowserPluginMsg_SetCursor::ID:
     case BrowserPluginMsg_ShouldAcceptTouchEvents::ID:
     case BrowserPluginMsg_UpdatedName::ID:
     case BrowserPluginMsg_UpdateRect::ID:
     case BrowserPluginMsg_BuffersSwapped::ID:
       return true;
     default:
       break;
   }
   return false;
 }
 
 }  // namespace content