Commit d989cce2 authored by dmichael@chromium.org's avatar dmichael@chromium.org

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
parent f001bd6a
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
'shared_impl/ppb_url_request_info_shared.h', 'shared_impl/ppb_url_request_info_shared.h',
'shared_impl/ppb_url_util_shared.cc', 'shared_impl/ppb_url_util_shared.cc',
'shared_impl/ppb_url_util_shared.h', 'shared_impl/ppb_url_util_shared.h',
'shared_impl/ppb_var_impl.cc', 'shared_impl/ppb_var_shared.cc',
'shared_impl/ppb_var_impl.h', 'shared_impl/ppb_var_shared.h',
'shared_impl/ppb_video_decoder_shared.cc', 'shared_impl/ppb_video_decoder_shared.cc',
'shared_impl/ppb_video_decoder_shared.h', 'shared_impl/ppb_video_decoder_shared.h',
'shared_impl/ppp_instance_combined.cc', 'shared_impl/ppp_instance_combined.cc',
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
#include "ppapi/proxy/ppp_video_decoder_proxy.h" #include "ppapi/proxy/ppp_video_decoder_proxy.h"
#include "ppapi/proxy/resource_creation_proxy.h" #include "ppapi/proxy/resource_creation_proxy.h"
#include "ppapi/shared_impl/ppb_opengles2_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/thunk/thunk.h" #include "ppapi/thunk/thunk.h"
// Helper to get the proxy name PPB_Foo_Proxy given the API name PPB_Foo. // Helper to get the proxy name PPB_Foo_Proxy given the API name PPB_Foo.
...@@ -166,9 +166,9 @@ InterfaceList::InterfaceList() { ...@@ -166,9 +166,9 @@ InterfaceList::InterfaceList() {
AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE, AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE,
PPB_OpenGLES2_Shared::GetInterface()); PPB_OpenGLES2_Shared::GetInterface());
AddPPB(PPB_VAR_INTERFACE, API_ID_NONE, AddPPB(PPB_VAR_INTERFACE, API_ID_NONE,
PPB_Var_Impl::GetVarInterface()); PPB_Var_Shared::GetVarInterface());
AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE, AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE,
PPB_Var_Impl::GetVarInterface1_0()); PPB_Var_Shared::GetVarInterface1_0());
AddFlashInterfaces(); AddFlashInterfaces();
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/ppp_class_proxy.h" #include "ppapi/proxy/ppp_class_proxy.h"
#include "ppapi/proxy/serialized_var.h" #include "ppapi/proxy/serialized_var.h"
#include "ppapi/shared_impl/ppb_var_impl.h" #include "ppapi/shared_impl/ppb_var_shared.h"
#include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var.h"
namespace ppapi { namespace ppapi {
...@@ -277,10 +277,10 @@ PPB_Var_Deprecated_Proxy::~PPB_Var_Deprecated_Proxy() { ...@@ -277,10 +277,10 @@ PPB_Var_Deprecated_Proxy::~PPB_Var_Deprecated_Proxy() {
// static // static
const InterfaceProxy::Info* PPB_Var_Deprecated_Proxy::GetInfo() { const InterfaceProxy::Info* PPB_Var_Deprecated_Proxy::GetInfo() {
static const PPB_Var_Deprecated var_deprecated_interface = { static const PPB_Var_Deprecated var_deprecated_interface = {
ppapi::PPB_Var_Impl::GetVarInterface1_0()->AddRef, ppapi::PPB_Var_Shared::GetVarInterface1_0()->AddRef,
ppapi::PPB_Var_Impl::GetVarInterface1_0()->Release, ppapi::PPB_Var_Shared::GetVarInterface1_0()->Release,
ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarFromUtf8, ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarFromUtf8,
ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarToUtf8, ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarToUtf8,
&HasProperty, &HasProperty,
&HasMethod, &HasMethod,
&GetProperty, &GetProperty,
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "ppapi/c/pp_var.h" #include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_var.h" #include "ppapi/c/ppb_var.h"
#include "ppapi/proxy/ppapi_proxy_test.h" #include "ppapi/proxy/ppapi_proxy_test.h"
#include "ppapi/shared_impl/ppb_var_impl.h" #include "ppapi/shared_impl/ppb_var_shared.h"
namespace { namespace {
std::string VarToString(const PP_Var& var, const PPB_Var* ppb_var) { std::string VarToString(const PP_Var& var, const PPB_Var* ppb_var) {
...@@ -30,7 +30,7 @@ class PPB_VarTest : public PluginProxyTest { ...@@ -30,7 +30,7 @@ class PPB_VarTest : public PluginProxyTest {
public: public:
PPB_VarTest() PPB_VarTest()
: test_strings_(kNumStrings), vars_(kNumStrings), : test_strings_(kNumStrings), vars_(kNumStrings),
ppb_var_(ppapi::PPB_Var_Impl::GetVarInterface()) { ppb_var_(ppapi::PPB_Var_Shared::GetVarInterface()) {
// Set the value of test_strings_[i] to "i". // Set the value of test_strings_[i] to "i".
for (size_t i = 0; i < kNumStrings; ++i) for (size_t i = 0; i < kNumStrings; ++i)
test_strings_[i] = base::IntToString(i); test_strings_[i] = base::IntToString(i);
...@@ -102,7 +102,7 @@ class CreateVarThreadDelegate : public base::PlatformThread::Delegate { ...@@ -102,7 +102,7 @@ class CreateVarThreadDelegate : public base::PlatformThread::Delegate {
} }
virtual ~CreateVarThreadDelegate() {} virtual ~CreateVarThreadDelegate() {}
virtual void ThreadMain() { virtual void ThreadMain() {
const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
for (size_t i = 0; i < size_; ++i) { for (size_t i = 0; i < size_; ++i) {
vars_out_[i] = ppb_var->VarFromUtf8(strings_in_[i].c_str(), vars_out_[i] = ppb_var->VarFromUtf8(strings_in_[i].c_str(),
strings_in_[i].length()); strings_in_[i].length());
...@@ -125,7 +125,7 @@ class ChangeRefVarThreadDelegate : public base::PlatformThread::Delegate { ...@@ -125,7 +125,7 @@ class ChangeRefVarThreadDelegate : public base::PlatformThread::Delegate {
} }
virtual ~ChangeRefVarThreadDelegate() {} virtual ~ChangeRefVarThreadDelegate() {}
virtual void ThreadMain() { virtual void ThreadMain() {
const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
// Increment and decrement the reference count for each var kRefsToAdd // Increment and decrement the reference count for each var kRefsToAdd
// times. Note that we always AddRef once before doing the matching Release, // times. Note that we always AddRef once before doing the matching Release,
// to ensure that we never accidentally release the last reference. // to ensure that we never accidentally release the last reference.
...@@ -153,7 +153,7 @@ class RemoveRefVarThreadDelegate : public base::PlatformThread::Delegate { ...@@ -153,7 +153,7 @@ class RemoveRefVarThreadDelegate : public base::PlatformThread::Delegate {
} }
virtual ~RemoveRefVarThreadDelegate() {} virtual ~RemoveRefVarThreadDelegate() {}
virtual void ThreadMain() { virtual void ThreadMain() {
const PPB_Var* ppb_var = ppapi::PPB_Var_Impl::GetVarInterface(); const PPB_Var* ppb_var = ppapi::PPB_Var_Shared::GetVarInterface();
for (size_t i = 0; i < kNumStrings; ++i) { for (size_t i = 0; i < kNumStrings; ++i) {
ppb_var->Release(vars_[i]); ppb_var->Release(vars_[i]);
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "ppapi/shared_impl/ppb_var_impl.h" #include "ppapi/shared_impl/ppb_var_shared.h"
#include <limits> #include <limits>
...@@ -65,12 +65,12 @@ const PPB_Var_1_0 var_interface1_0 = { ...@@ -65,12 +65,12 @@ const PPB_Var_1_0 var_interface1_0 = {
} // namespace } // namespace
// static // static
const PPB_Var* PPB_Var_Impl::GetVarInterface() { const PPB_Var* PPB_Var_Shared::GetVarInterface() {
return &var_interface; return &var_interface;
} }
// static // static
const PPB_Var_1_0* PPB_Var_Impl::GetVarInterface1_0() { const PPB_Var_1_0* PPB_Var_Shared::GetVarInterface1_0() {
return &var_interface1_0; return &var_interface1_0;
} }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef PPAPI_SHARED_IMPL_PPB_VAR_IMPL_H_ #ifndef PPAPI_SHARED_IMPL_PPB_VAR_SHARED_H_
#define PPAPI_SHARED_IMPL_PPB_VAR_IMPL_H_ #define PPAPI_SHARED_IMPL_PPB_VAR_SHARED_H_
#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_module.h"
#include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_stdint.h"
...@@ -15,7 +15,7 @@ struct PPB_Var_1_0; ...@@ -15,7 +15,7 @@ struct PPB_Var_1_0;
namespace ppapi { namespace ppapi {
class PPAPI_SHARED_EXPORT PPB_Var_Impl { class PPAPI_SHARED_EXPORT PPB_Var_Shared {
public: public:
static const PPB_Var* GetVarInterface(); static const PPB_Var* GetVarInterface();
static const PPB_Var_1_0* GetVarInterface1_0(); static const PPB_Var_1_0* GetVarInterface1_0();
...@@ -23,4 +23,4 @@ class PPAPI_SHARED_EXPORT PPB_Var_Impl { ...@@ -23,4 +23,4 @@ class PPAPI_SHARED_EXPORT PPB_Var_Impl {
} // namespace ppapi } // namespace ppapi
#endif // PPAPI_SHARED_IMPL_PPB_VAR_IMPL_H_ #endif // PPAPI_SHARED_IMPL_PPB_VAR_SHARED_H_
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
#include "ppapi/c/trusted/ppb_url_loader_trusted.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
#include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/ppb_input_event_shared.h"
#include "ppapi/shared_impl/ppb_opengles2_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/shared_impl/time_conversion.h"
#include "ppapi/thunk/enter.h" #include "ppapi/thunk/enter.h"
#include "ppapi/thunk/thunk.h" #include "ppapi/thunk/thunk.h"
...@@ -325,9 +325,9 @@ const void* GetInterface(const char* name) { ...@@ -325,9 +325,9 @@ const void* GetInterface(const char* name) {
if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0) if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface(); return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface();
if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) 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) 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 #ifdef ENABLE_FLAPPER_HACKS
if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0) if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/dev/ppb_var_deprecated.h"
#include "ppapi/c/ppb_var.h" #include "ppapi/c/ppb_var.h"
#include "ppapi/c/pp_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 "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/common.h"
#include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/host_globals.h"
...@@ -397,10 +397,10 @@ PP_Var CreateObjectWithModuleDeprecated(PP_Module pp_module, ...@@ -397,10 +397,10 @@ PP_Var CreateObjectWithModuleDeprecated(PP_Module pp_module,
// static // static
const PPB_Var_Deprecated* PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface() { const PPB_Var_Deprecated* PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface() {
static const PPB_Var_Deprecated var_deprecated_interface = { static const PPB_Var_Deprecated var_deprecated_interface = {
::ppapi::PPB_Var_Impl::GetVarInterface1_0()->AddRef, ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->AddRef,
::ppapi::PPB_Var_Impl::GetVarInterface1_0()->Release, ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->Release,
::ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarFromUtf8, ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarFromUtf8,
::ppapi::PPB_Var_Impl::GetVarInterface1_0()->VarToUtf8, ::ppapi::PPB_Var_Shared::GetVarInterface1_0()->VarToUtf8,
&HasPropertyDeprecated, &HasPropertyDeprecated,
&HasMethodDeprecated, &HasMethodDeprecated,
&GetProperty, &GetProperty,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment