diff options
author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 22:37:36 +0000 |
---|---|---|
committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 22:37:36 +0000 |
commit | 6788b080965ee06e7bc329526834cd1490a5b772 (patch) | |
tree | f265dd4bd700ef2ecef652dfa38014d3db7ae614 /content/renderer | |
parent | 1e44a9a4adccf4f31d817177e2ee47b58c93f40d (diff) | |
download | chromium_src-6788b080965ee06e7bc329526834cd1490a5b772.zip chromium_src-6788b080965ee06e7bc329526834cd1490a5b772.tar.gz chromium_src-6788b080965ee06e7bc329526834cd1490a5b772.tar.bz2 |
Added PPB_BrokerTrusted interface and a basic Chrome implementation of it.
The broker is not launched or connected yet.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6677178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r-- | content/renderer/pepper_plugin_delegate_impl.cc | 19 | ||||
-rw-r--r-- | content/renderer/pepper_plugin_delegate_impl.h | 3 |
2 files changed, 22 insertions, 0 deletions
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 96c775c..b598a96 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -53,6 +53,7 @@ #include "webkit/plugins/ppapi/ppb_file_io_impl.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" +#include "webkit/plugins/ppapi/ppb_broker_impl.h" #include "webkit/plugins/ppapi/ppb_flash_impl.h" #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" @@ -556,6 +557,24 @@ PepperPluginDelegateImpl::CreateAudio( } } +webkit::ppapi::PluginDelegate::PpapiBroker* +PepperPluginDelegateImpl::ConnectToPpapiBroker( + webkit::ppapi::PluginInstance* instance, + webkit::ppapi::PPB_Broker_Impl* client) { + CHECK(instance); + CHECK(client); + + // TODO(ddorwin): Add IPC to broker process to do the following. + // 1) Check if there is an existing broker for instance->module(). + // 2) If not, create. + // 3) broker->Connect(client). + // * Asynchronously launches broker if necessary, establishes pipe, and + // calls BrokerConnected. + // 4) Return pointer to broker. + + return NULL; +} + bool PepperPluginDelegateImpl::RunFileChooser( const WebKit::WebFileChooserParams& params, WebKit::WebFileChooserCompletion* chooser_completion) { diff --git a/content/renderer/pepper_plugin_delegate_impl.h b/content/renderer/pepper_plugin_delegate_impl.h index f839229..8749f3d 100644 --- a/content/renderer/pepper_plugin_delegate_impl.h +++ b/content/renderer/pepper_plugin_delegate_impl.h @@ -100,6 +100,9 @@ class PepperPluginDelegateImpl virtual PlatformContext3D* CreateContext3D(); virtual PlatformVideoDecoder* CreateVideoDecoder( PP_VideoDecoderConfig_Dev* decoder_config); + virtual PpapiBroker* ConnectToPpapiBroker( + webkit::ppapi::PluginInstance* instance, + webkit::ppapi::PPB_Broker_Impl* client); virtual void NumberOfFindResultsChanged(int identifier, int total, bool final_result); |