| Index: ppapi/proxy/ppb_image_data_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
|
| index c9d61f9feae039505b9121dab1244f5f567e2925..87b49a777a1caf669be091172a24d52acfdecf0a 100644
|
| --- a/ppapi/proxy/ppb_image_data_proxy.cc
|
| +++ b/ppapi/proxy/ppb_image_data_proxy.cc
|
| @@ -416,8 +416,6 @@ SkCanvas* PlatformImageData::GetCanvas() {
|
| ImageHandle PlatformImageData::NullHandle() {
|
| #if defined(OS_WIN)
|
| return NULL;
|
| -#elif defined(TOOLKIT_GTK)
|
| - return 0;
|
| #else
|
| return ImageHandle();
|
| #endif
|
| @@ -426,8 +424,6 @@ ImageHandle PlatformImageData::NullHandle() {
|
| ImageHandle PlatformImageData::HandleFromInt(int32_t i) {
|
| #if defined(OS_WIN)
|
| return reinterpret_cast<ImageHandle>(i);
|
| -#elif defined(TOOLKIT_GTK)
|
| - return static_cast<ImageHandle>(i);
|
| #else
|
| return ImageHandle(i, false);
|
| #endif
|
| @@ -607,14 +603,6 @@ 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(TOOLKIT_GTK)
|
| - // On X Windows, a PlatformImageData is backed by a SysV shared memory key,
|
| - // so embed that in a fake PlatformFileForTransit and don't share it across
|
| - // processes.
|
| - if (type == PPB_ImageData_Shared::PLATFORM)
|
| - *image_handle = IPC::PlatformFileForTransit(local_fd, false);
|
| - else
|
| - *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false);
|
| #elif defined(OS_POSIX)
|
| *image_handle = dispatcher->ShareHandleWithRemote(local_fd, false);
|
| #else
|
| @@ -643,12 +631,7 @@ void PPB_ImageData_Proxy::OnHostMsgCreatePlatform(
|
| desc, &image_handle, &byte_count);
|
| result->SetHostResource(instance, resource);
|
| if (resource) {
|
| -#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 {
|
| *result_image_handle = PlatformImageData::NullHandle();
|
| }
|
|
|