diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 21:15:26 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 21:15:26 +0000 |
commit | 177dcee207de2f248bc66cfaa99ab91a9d8e7c12 (patch) | |
tree | f91d097798f0fd65c6560787557c289f9f427a7d /content/renderer/pepper/ppb_broker_impl.cc | |
parent | 6e7186eaef0075c6e3e68afba68e0f6edcec00bb (diff) | |
download | chromium_src-177dcee207de2f248bc66cfaa99ab91a9d8e7c12.zip chromium_src-177dcee207de2f248bc66cfaa99ab91a9d8e7c12.tar.gz chromium_src-177dcee207de2f248bc66cfaa99ab91a9d8e7c12.tar.bz2 |
A few more cleanups to the pepper code. Dispatch IPCs in the sockets implementations directly by having each object generate its own routing id. This allows us to remove the code to handle mapping in PepperHelperImpl. Also get rid of ResourceHelper since it was just a wrapper around other methods.
BUG=263054
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/20777009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/ppb_broker_impl.cc')
-rw-r--r-- | content/renderer/pepper/ppb_broker_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/pepper/ppb_broker_impl.cc b/content/renderer/pepper/ppb_broker_impl.cc index 38943ae..3eba82a 100644 --- a/content/renderer/pepper/ppb_broker_impl.cc +++ b/content/renderer/pepper/ppb_broker_impl.cc @@ -6,11 +6,11 @@ #include "base/logging.h" #include "content/renderer/pepper/common.h" +#include "content/renderer/pepper/host_globals.h" #include "content/renderer/pepper/pepper_broker.h" #include "content/renderer/pepper/pepper_helper_impl.h" #include "content/renderer/pepper/pepper_plugin_instance_impl.h" #include "content/renderer/pepper/plugin_module.h" -#include "content/renderer/pepper/resource_helper.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/platform_file.h" #include "third_party/WebKit/public/web/WebDocument.h" @@ -56,7 +56,7 @@ int32_t PPB_Broker_Impl::Connect( } PepperPluginInstanceImpl* plugin_instance = - ResourceHelper::GetPluginInstance(this); + HostGlobals::Get()->GetInstance(pp_instance()); if (!plugin_instance) return PP_ERROR_FAILED; @@ -84,7 +84,7 @@ int32_t PPB_Broker_Impl::GetHandle(int32_t* handle) { GURL PPB_Broker_Impl::GetDocumentUrl() { PepperPluginInstanceImpl* plugin_instance = - ResourceHelper::GetPluginInstance(this); + HostGlobals::Get()->GetInstance(pp_instance()); return plugin_instance->container()->element().document().url(); } |