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 /webkit/plugins/ppapi | |
| 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 'webkit/plugins/ppapi')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_broker_impl.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/webkit/plugins/ppapi/ppb_broker_impl.cc b/webkit/plugins/ppapi/ppb_broker_impl.cc index 7d897c7..9696899 100644 --- a/webkit/plugins/ppapi/ppb_broker_impl.cc +++ b/webkit/plugins/ppapi/ppb_broker_impl.cc @@ -5,31 +5,17 @@ #include "webkit/plugins/ppapi/ppb_broker_impl.h" #include "base/logging.h" +#include "ppapi/shared_impl/platform_file.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/resource_helper.h" +using ::ppapi::PlatformFileToInt; using ::ppapi::thunk::PPB_Broker_API; namespace webkit { namespace ppapi { -namespace { - -// TODO(ddorwin): Put conversion functions in a common place and/or add an -// invalid value to sync_socket.h. -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 - // PPB_Broker_Impl ------------------------------------------------------ PPB_Broker_Impl::PPB_Broker_Impl(PP_Instance instance) |