diff options
author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 23:46:46 +0000 |
---|---|---|
committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 23:46:46 +0000 |
commit | 5a77eca1f12943edb45b032219da0f32057240fd (patch) | |
tree | b08f598e12e42cfffeead23307ebcf61afc622f1 /ppapi/proxy/ppb_broker_proxy.cc | |
parent | 5f903b636a1cb8cff34eff4c51be7d7948744025 (diff) | |
download | chromium_src-5a77eca1f12943edb45b032219da0f32057240fd.zip chromium_src-5a77eca1f12943edb45b032219da0f32057240fd.tar.gz chromium_src-5a77eca1f12943edb45b032219da0f32057240fd.tar.bz2 |
Merge definitions of PlatformFileToInt and IntToPlatformFile to one place.
BUG=none
TEST=normal browsing on m17
Review URL: http://codereview.chromium.org/8585013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_broker_proxy.cc')
-rw-r--r-- | ppapi/proxy/ppb_broker_proxy.cc | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc index d65af66..657c5f5 100644 --- a/ppapi/proxy/ppb_broker_proxy.cc +++ b/ppapi/proxy/ppb_broker_proxy.cc @@ -10,46 +10,25 @@ #include "ppapi/proxy/enter_proxy.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" +#include "ppapi/shared_impl/platform_file.h" #include "ppapi/thunk/ppb_broker_api.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/resource_creation_api.h" #include "ppapi/thunk/thunk.h" +using ppapi::IntToPlatformFile; +using ppapi::PlatformFileToInt; using ppapi::thunk::PPB_Broker_API; namespace ppapi { namespace proxy { -namespace { - -base::PlatformFile IntToPlatformFile(int32_t handle) { -#if defined(OS_WIN) - return reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle)); -#elif defined(OS_POSIX) - return handle; -#else - #error Not implemented. -#endif -} - -int32_t PlatformFileToInt(base::PlatformFile handle) { -#if defined(OS_WIN) - return static_cast<int32_t>(reinterpret_cast<intptr_t>(handle)); -#elif defined(OS_POSIX) - return handle; -#else - #error Not implemented. -#endif -} - -} // namespace - class Broker : public PPB_Broker_API, public Resource { public: explicit Broker(const HostResource& resource); virtual ~Broker(); - // Resource overries. + // Resource overrides. virtual PPB_Broker_API* AsPPB_Broker_API() OVERRIDE; // PPB_Broker_API implementation. |