diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 04:51:14 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 04:51:14 +0000 |
| commit | d989cce292e1696f5bf26d0e0bdb64bdd0090168 (patch) | |
| tree | af0deed23b5a9f3e637832a30fb3f8aa1808979e /webkit/plugins | |
| parent | f001bd6a14612d0d547539c5a7a3cf53f95e3816 (diff) | |
| download | chromium_src-d989cce292e1696f5bf26d0e0bdb64bdd0090168.zip chromium_src-d989cce292e1696f5bf26d0e0bdb64bdd0090168.tar.gz chromium_src-d989cce292e1696f5bf26d0e0bdb64bdd0090168.tar.bz2 | |
Apply renaming of ppapi shared stuff to new ppb_var shared code.
This CL brings the PPB_Var new shared implementation (from r113491) in to compliance with the new naming convention introduced at r113428. I didn't want to do add any more complexity to that in-flight CL, so I'm doing the rename here.
BUG=None
TEST=N/A
Review URL: http://codereview.chromium.org/8870002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_var_deprecated_impl.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index 6845fb1..aaee85f 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -85,7 +85,7 @@ #include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/ppb_opengles2_shared.h" -#include "ppapi/shared_impl/ppb_var_impl.h" +#include "ppapi/shared_impl/ppb_var_shared.h" #include "ppapi/shared_impl/time_conversion.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/thunk.h" @@ -325,9 +325,9 @@ const void* GetInterface(const char* name) { if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0) return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface(); if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) - return ::ppapi::PPB_Var_Impl::GetVarInterface1_0(); + return ::ppapi::PPB_Var_Shared::GetVarInterface1_0(); if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0) - return ::ppapi::PPB_Var_Impl::GetVarInterface(); + return ::ppapi::PPB_Var_Shared::GetVarInterface(); #ifdef ENABLE_FLAPPER_HACKS if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0) diff --git a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc index c946222..59c7c82 100644 --- a/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc +++ b/webkit/plugins/ppapi/ppb_var_deprecated_impl.cc @@ -9,7 +9,7 @@ #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/ppb_var.h" #include "ppapi/c/pp_var.h" -#include "ppapi/shared_impl/ppb_var_impl.h" +#include "ppapi/shared_impl/ppb_var_shared.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/host_globals.h" @@ -397,10 +397,10 @@ PP_Var CreateObjectWithModuleDeprecated(PP_Module pp_module, // static const PPB_Var_Deprecated* PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface() { static const PPB_Var_Deprecated var_deprecated_interface = { - ::ppapi::PPB_Var_Impl::GetVarInterface1_0()->AddRef, - ::ppapi::PPB_Var_Impl::GetVarInterface1_0()->Release, - ::ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarFromUtf8, - ::ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarToUtf8, + ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->AddRef, + ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->Release, + ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarFromUtf8, + ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarToUtf8, &HasPropertyDeprecated, &HasMethodDeprecated, &GetProperty, |