diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 07:31:44 +0000 |
| commit | 1dfb8befd5916a9bc6c6d6b16e897172930b9a8b (patch) | |
| tree | 9acc010228a8c6a2c37a28fd797214b88991eaa6 /ppapi | |
| parent | f3b55cea740c629621d9258400cc7d2d5a1a7eb1 (diff) | |
| download | chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.zip chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.gz chromium_src-1dfb8befd5916a9bc6c6d6b16e897172930b9a8b.tar.bz2 | |
Switch Linux Aura ports over to POSIX SHM instead of legacy SYSV SHM.
BUG=147622
R=jln@chromium.org, piman@chromium.org, skaslev@chromium.org
Review URL: https://codereview.chromium.org/13529027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/pdf_resource.cc | 6 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_image_data_proxy.cc | 24 | ||||
| -rw-r--r-- | ppapi/proxy/serialized_structs.h | 8 | ||||
| -rw-r--r-- | ppapi/proxy/video_source_resource.cc | 8 |
4 files changed, 23 insertions, 23 deletions
diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc index 5c66017..07d343094 100644 --- a/ppapi/proxy/pdf_resource.cc +++ b/ppapi/proxy/pdf_resource.cc @@ -182,13 +182,13 @@ PP_Resource PDFResource::GetResourceImageForScale(PP_ResourceImage image_id, #if defined(OS_ANDROID) // This is compiled into android for tests only. return 0; -#elif defined(OS_WIN) || defined(OS_MACOSX) +#elif defined(TOOLKIT_GTK) + return (new ImageData(resource, image_desc, fd))->GetReference(); +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) base::SharedMemoryHandle handle; if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &handle)) return 0; return (new ImageData(resource, image_desc, handle))->GetReference(); -#elif defined(OS_LINUX) - return (new ImageData(resource, image_desc, fd))->GetReference(); #else #error Not implemented. #endif diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc index 40fddf4..999ab81 100644 --- a/ppapi/proxy/ppb_image_data_proxy.cc +++ b/ppapi/proxy/ppb_image_data_proxy.cc @@ -430,20 +430,20 @@ void ImageData::RecycleToPlugin(bool zero_contents) { ImageHandle ImageData::NullHandle() { #if defined(OS_WIN) return NULL; -#elif defined(OS_MACOSX) || defined(OS_ANDROID) - return ImageHandle(); -#else +#elif defined(TOOLKIT_GTK) return 0; +#else + return ImageHandle(); #endif } ImageHandle ImageData::HandleFromInt(int32_t i) { #if defined(OS_WIN) return reinterpret_cast<ImageHandle>(i); -#elif defined(OS_MACOSX) || defined(OS_ANDROID) - return ImageHandle(i, false); -#else +#elif defined(TOOLKIT_GTK) return static_cast<ImageHandle>(i); +#else + return ImageHandle(i, false); #endif } #endif // !defined(OS_NACL) @@ -566,14 +566,14 @@ PP_Resource PPB_ImageData_Proxy::CreateImageData( #if defined(OS_WIN) *image_handle = dispatcher->ShareHandleWithRemote( reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd)), false); -#elif defined(OS_MACOSX) || defined(OS_ANDROID) - *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false); -#elif defined(OS_POSIX) +#elif defined(TOOLKIT_GTK) // On X Windows, a non-nacl handle is a SysV shared memory key. if (is_nacl_plugin) *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false); else *image_handle = IPC::PlatformFileForTransit(local_fd, false); +#elif defined(OS_POSIX) + *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false); #else #error Not implemented. #endif @@ -602,11 +602,11 @@ void PPB_ImageData_Proxy::OnHostMsgCreate(PP_Instance instance, if (resource) { image_data_desc->resize(sizeof(PP_ImageDataDesc)); memcpy(&(*image_data_desc)[0], &desc, sizeof(PP_ImageDataDesc)); -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) - *result_image_handle = image_handle; -#else +#if defined(TOOLKIT_GTK) // On X Windows ImageHandle is a SysV shared memory key. *result_image_handle = image_handle.fd; +#else + *result_image_handle = image_handle; #endif } else { image_data_desc->clear(); diff --git a/ppapi/proxy/serialized_structs.h b/ppapi/proxy/serialized_structs.h index 2b403b4..835142b 100644 --- a/ppapi/proxy/serialized_structs.h +++ b/ppapi/proxy/serialized_structs.h @@ -120,11 +120,11 @@ struct PPPDecryptor_Buffer { // TODO(raymes): Make ImageHandle compatible with SerializedHandle. #if defined(OS_WIN) typedef HANDLE ImageHandle; -#elif defined(OS_MACOSX) || defined(OS_ANDROID) -typedef base::SharedMemoryHandle ImageHandle; -#else -// On X Windows this is a SysV shared memory key. +#elif defined(TOOLKIT_GTK) +// On legacy X Windows this is a SysV shared memory key. typedef int ImageHandle; +#else +typedef base::SharedMemoryHandle ImageHandle; #endif } // namespace proxy diff --git a/ppapi/proxy/video_source_resource.cc b/ppapi/proxy/video_source_resource.cc index 5e1dbc7..3bce63d 100644 --- a/ppapi/proxy/video_source_resource.cc +++ b/ppapi/proxy/video_source_resource.cc @@ -109,15 +109,15 @@ void VideoSourceResource::OnPluginMsgGetFrameComplete( #if defined(OS_ANDROID) frame->image_data = 0; -#elif defined(OS_WIN) || defined(OS_MACOSX) +#elif defined(TOOLKIT_GTK) + frame->image_data = + (new ImageData(image_data, image_desc, fd))->GetReference(); +#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) base::SharedMemoryHandle handle; if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &handle)) frame->image_data = 0; frame->image_data = (new ImageData(image_data, image_desc, handle))->GetReference(); -#elif defined(OS_LINUX) - frame->image_data = - (new ImageData(image_data, image_desc, fd))->GetReference(); #else #error Not implemented. #endif |