Browser Plugin: Simplified BrowserPluginManager

content/renderer/render_view_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/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 44 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/context_menu_client.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/password_form_conversion_utils.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
+#include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 #include "content/renderer/device_orientation_dispatcher.h"
 #include "content/renderer/devtools_agent.h"
 #include "content/renderer/disambiguation_popup_helper.h"
 #include "content/renderer/dom_automation_controller.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
 #include "content/renderer/do_not_track_bindings.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/geolocation_dispatcher.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/gpu/compositor_output_surface.h"
@@ skipping 494 matching lines @@
       cached_is_main_frame_pinned_to_left_(false),
       cached_is_main_frame_pinned_to_right_(false),
       cached_has_main_frame_horizontal_scrollbar_(false),
       cached_has_main_frame_vertical_scrollbar_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       geolocation_dispatcher_(NULL),
       input_tag_speech_dispatcher_(NULL),
       speech_recognition_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
       media_stream_dispatcher_(NULL),
+      browser_plugin_manager_(NULL),
       media_stream_impl_(NULL),
       devtools_agent_(NULL),
       accessibility_mode_(AccessibilityModeOff),
       renderer_accessibility_(NULL),
       java_bridge_dispatcher_(NULL),
       mouse_lock_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       body_background_color_(SK_ColorWHITE),
       update_frame_info_scheduled_(false),
       expected_content_intent_id_(0),
@@ skipping 1858 matching lines @@
 
 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
                                         const WebPluginParams& params) {
   WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
   if (UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) {
-    return BrowserPluginManager::Get()->
-        CreateBrowserPlugin(this, frame, params);
+    return browser_plugin_manager()->CreateBrowserPlugin(this, frame, params);
   }
 
   webkit::WebPluginInfo info;
   std::string mime_type;
   bool found = GetPluginInfo(params.url, frame->top()->document().url(),
                              params.mimeType.utf8(), &info, &mime_type);
   if (!found)
     return NULL;
 
   WebPluginParams params_to_use = params;
@@ skipping 1388 matching lines @@
 // This function sends those updates to the browser and updates the RVH
 // corresponding to this object. It must be called on any events that modify
 // the tree structure or the names of any frames.
 void RenderViewImpl::SendUpdatedFrameTree(
     WebKit::WebFrame* exclude_frame_subtree) {
   // TODO(nasko): Frame tree updates are causing issues with postMessage, as
   // described in http://crbug.com/153701. Disable them until a proper fix is
   // in place.
 }
 
+BrowserPluginManager* RenderViewImpl::browser_plugin_manager() {
+  if (!browser_plugin_manager_)
+    browser_plugin_manager_ = BrowserPluginManager::Create(this);
+  return browser_plugin_manager_;
+}
+
 void RenderViewImpl::CreateFrameTree(WebKit::WebFrame* frame,
                                      DictionaryValue* frame_tree) {
   // TODO(nasko): Remove once http://crbug.com/153701 is fixed.
   DCHECK(false);
   NavigateToSwappedOutURL(frame);
 
   string16 name;
   if (frame_tree->GetString(kFrameTreeNodeNameKey, &name) && !name.empty())
     frame->setName(name);
 
@@ skipping 1923 matching lines @@
       // activation state to change just like a call to setIsActive.
       if (enable)
         (*plugin_it)->SetWindowFocus(true);
 #endif
       (*plugin_it)->SetContentAreaFocus(enable);
     }
   }
   // Notify all Pepper plugins.
   pepper_delegate_.OnSetFocus(enable);
   // Notify all BrowserPlugins of the RenderView's focus state.
-  BrowserPluginManager::Get()->SetEmbedderFocus(this, enable);
+  if (has_browser_plugin_manager())

[Charlie Reis, 2012/11/20 00:33:34]

Great-- I'm glad we can avoid creating it.

Would a null check on browser_plugin_manager_ work here, or is there a reason to
have a method for it?

[Fady Samuel, 2012/11/20 02:04:15]

Done.

+    browser_plugin_manager()->SetEmbedderFocus(this, enable);
 }
 
 void RenderViewImpl::PpapiPluginFocusChanged() {
   UpdateTextInputState(DO_NOT_SHOW_IME);
   UpdateSelectionBounds();
 }
 
 void RenderViewImpl::PpapiPluginTextInputTypeChanged() {
   UpdateTextInputState(DO_NOT_SHOW_IME);
   if (renderer_accessibility_)
@@ skipping 588 matching lines @@
 }
 #endif
 
 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
     TransportDIB::Handle dib_handle) {
   TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
   RenderProcess::current()->ReleaseTransportDIB(dib);
 }
 
 }  // namespace content