Browser Plugin: Simplified BrowserPluginManager

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"
 #include "webkit/glue/webcursor.h"
 
 namespace content {
 
-BrowserPluginManagerImpl::BrowserPluginManagerImpl() {
+BrowserPluginManagerImpl::BrowserPluginManagerImpl(
+    RenderViewImpl* render_view)
+    : BrowserPluginManager(render_view) {
 }
 
 BrowserPluginManagerImpl::~BrowserPluginManagerImpl() {
 }
 
 BrowserPlugin* BrowserPluginManagerImpl::CreateBrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params) {
   return new BrowserPlugin(browser_plugin_counter_++,
                            render_view,
                            frame,
                            params);
 }
 
 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
   return RenderThread::Get()->Send(msg);
 }
 
-bool BrowserPluginManagerImpl::OnControlMessageReceived(
+bool BrowserPluginManagerImpl::OnMessageReceived(
     const IPC::Message& message) {
-  DCHECK(CalledOnValidThread());
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginManagerImpl, message)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestGone, OnGuestGone)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_AdvanceFocus, OnAdvanceFocus)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_GuestContentWindowReady,
                         OnGuestContentWindowReady)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_ShouldAcceptTouchEvents,
                         OnShouldAcceptTouchEvents)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStart, OnLoadStart)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadAbort, OnLoadAbort)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadRedirect, OnLoadRedirect)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadCommit, OnLoadCommit)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadStop, OnLoadStop)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_SetCursor, OnSetCursor)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_PluginAtPositionRequest,
                         OnPluginAtPositionRequest);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginManagerImpl::OnPluginAtPositionRequest(
-    int source_routing_id, int request_id, const gfx::Point& position) {
+    int request_id, const gfx::Point& position) {
   int instance_id = -1;
   IDMap<BrowserPlugin>::iterator it(&instances_);
   gfx::Point local_position = position;
+  int source_routing_id = -1;
   while (!it.IsAtEnd()) {
     const BrowserPlugin* plugin = it.GetCurrentValue();
     // We need to check the plugin's routing id too since BrowserPluginManager
     // can manage plugins from other embedder (in the same process).
-    if (plugin->render_view_routing_id() == source_routing_id &&
-        plugin->InBounds(position)) {
+    if (plugin->InBounds(position)) {
+      source_routing_id = plugin->render_view_routing_id();
       instance_id = plugin->instance_id();
       local_position = plugin->ToLocalCoordinates(position);
       break;
     }
     it.Advance();
   }
 
   Send(new BrowserPluginHostMsg_PluginAtPositionResponse(
-      source_routing_id,
-      instance_id,
-      request_id,
-      local_position));
+       source_routing_id,
+       instance_id,
+       request_id,
+       local_position));
 }
 
 void BrowserPluginManagerImpl::OnUpdateRect(
     int instance_id,
     int message_id,
     const BrowserPluginMsg_UpdateRect_Params& params) {
   BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
   if (plugin)
     plugin->UpdateRect(message_id, params);
 }
@@ skipping 67 matching lines @@
 }
 
 void BrowserPluginManagerImpl::OnSetCursor(int instance_id,
                                            const WebCursor& cursor) {
   BrowserPlugin* plugin = GetBrowserPlugin(instance_id);
   if (plugin)
     plugin->SetCursor(cursor);
 }
 
 }  // namespace content