diff options
author | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 01:49:31 +0000 |
---|---|---|
committer | fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 01:49:31 +0000 |
commit | 468e49044631580483bd15dd2ff9a548bd886968 (patch) | |
tree | 1d760140ddc8779799ef6e981e88e0fe4d9a6339 /content/renderer/render_thread_impl.cc | |
parent | 28599f4802c403c4d362f734ba37f81b552be977 (diff) | |
download | chromium_src-468e49044631580483bd15dd2ff9a548bd886968.zip chromium_src-468e49044631580483bd15dd2ff9a548bd886968.tar.gz chromium_src-468e49044631580483bd15dd2ff9a548bd886968.tar.bz2 |
Renderer-side changes for browser plugin
Major Classes:
BrowserPluginChannelManager: Manages GuestToEmbedderChannels. It essentially wraps a map that is keyed on channel names.
GuestToEmbedderChannel: Is a Dispatcher. Receives/Sends Ppapi messages. Keeps track of all RenderViews that have an associated PP_Instance in a map (RenderViews that are guests). brettw@ might want to have a look here?
BrowserPluginRegistry: Wrapper around map that keeps track of Browser Plugin PluginModules keyed on the guest process id. This is similar to the PepperPluginRegistry but has a different key type.
BrowserPluginVarSerializationRules: Temporary do nothing class as suggested by brettw@
BrowserPlugin: Towards becoming a wrapper around a WebPluginContainerImpl that swaps out WebPluginImpl/WebViewPlugin on navigation. We get a blank WebViewPlugin (is this a best thing to do to get a blank placeholder?) if we have an empty src attribute or while we're navigating for the first time. Otherwise, on cross-process navigations, we substitute one WebPluginImpl for another WebPluginImpl. TODO: BrowserPlugin should track the lifetime of WebPluginContainerImpl, but right now it lives forever which is bad. Will fix this in a subsequent patch. This requires some WebKit changes first.
BUG=117897
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/9968097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.cc')
-rw-r--r-- | content/renderer/render_thread_impl.cc | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index f7125d7..fe72093 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -46,6 +46,8 @@ #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_process_observer.h" #include "content/public/renderer/render_view_visitor.h" +#include "content/renderer/browser_plugin/browser_plugin_channel_manager.h" +#include "content/renderer/browser_plugin/browser_plugin_registry.h" #include "content/renderer/devtools_agent_filter.h" #include "content/renderer/dom_storage/dom_storage_dispatcher.h" #include "content/renderer/dom_storage/webstoragearea_impl.h" @@ -212,6 +214,11 @@ void RenderThreadImpl::Init() { dom_storage_dispatcher_.reset(new DomStorageDispatcher()); main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher()); + browser_plugin_registry_.reset(new content::BrowserPluginRegistry()); + browser_plugin_channel_manager_.reset( + new content::BrowserPluginChannelManager()); + AddObserver(browser_plugin_channel_manager_.get()); + media_stream_center_ = NULL; db_message_filter_ = new DBMessageFilter(); @@ -869,22 +876,26 @@ void RenderThreadImpl::OnSetCSSColors( void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) { EnsureWebKitInitialized(); // When bringing in render_view, also bring in webkit's glue and jsbindings. - RenderViewImpl::Create( - params.parent_window, - params.opener_route_id, - params.renderer_preferences, - params.web_preferences, - new SharedRenderViewCounter(0), - params.view_id, - params.surface_id, - params.session_storage_namespace_id, - params.frame_name, - false, - params.swapped_out, - params.next_page_id, - params.screen_info, - false, - params.accessibility_mode); + if (!params.embedder_channel_name.empty()) { + browser_plugin_channel_manager()->CreateRenderView(params); + } else { + RenderViewImpl::Create( + params.parent_window, + params.opener_route_id, + params.renderer_preferences, + params.web_preferences, + new SharedRenderViewCounter(0), + params.view_id, + params.surface_id, + params.session_storage_namespace_id, + params.frame_name, + false, + params.swapped_out, + params.next_page_id, + params.screen_info, + NULL, + params.accessibility_mode); + } } GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |