Switch Linux Auru ports over to POSIX SHM instead of legacy SYSV SHM.

ppapi/proxy/ppb_image_data_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <map>
 #include <vector>
@@ skipping 412 matching lines @@
     memset(data, 0, desc_.stride * desc_.size.height);
     Unmap();
   }
 }
 
 #if !defined(OS_NACL)
 // static
 ImageHandle ImageData::NullHandle() {
 #if defined(OS_WIN)
   return NULL;
-#elif defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(TOOLKIT_GTK)
+  return 0;
+#else
   return ImageHandle();
-#else
-  return 0;
 #endif
 }
 
 ImageHandle ImageData::HandleFromInt(int32_t i) {
 #if defined(OS_WIN)
     return reinterpret_cast<ImageHandle>(i);
-#elif defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(TOOLKIT_GTK)
+    return static_cast<ImageHandle>(i);
+#else
     return ImageHandle(i, false);
-#else
-    return static_cast<ImageHandle>(i);
 #endif
 }
 #endif  // !defined(OS_NACL)
 
 // PPB_ImageData_Proxy ---------------------------------------------------------
 
 PPB_ImageData_Proxy::PPB_ImageData_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
 }
 
@@ skipping 102 matching lines @@
   int local_fd = 0;
   if (enter_resource.object()->GetSharedMemory(&local_fd,
                                                byte_count) != PP_OK) {
     DVLOG(1) << "CreateImageData failed: could not GetSharedMemory";
     return 0;
   }
 
 #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
 
   return resource.Release();
 }
 
 void PPB_ImageData_Proxy::OnHostMsgCreate(PP_Instance instance,
                                           int32_t format,
                                           const PP_Size& size,
                                           PP_Bool init_to_zero,
                                           HostResource* result,
                                           std::string* image_data_desc,
                                           ImageHandle* result_image_handle) {
   PP_ImageDataDesc desc;
   IPC::PlatformFileForTransit image_handle;
   uint32_t byte_count;
   PP_Resource resource =
       CreateImageData(instance,
                       static_cast<PP_ImageDataFormat>(format),
                       size,
                       true /* init_to_zero */,
                       false /* is_nacl_plugin */,
                       &desc, &image_handle, &byte_count);
   result->SetHostResource(instance, resource);
   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();
     *result_image_handle = ImageData::NullHandle();
   }
 }
 
 void PPB_ImageData_Proxy::OnHostMsgCreateNaCl(
     PP_Instance instance,
     int32_t format,
@@ skipping 42 matching lines @@
   // still cached in our process, the proxy still holds a reference so we can
   // remove the one the renderer just sent is. If the proxy no longer holds a
   // reference, we released everything and we should also release the one the
   // renderer just sent us.
   dispatcher()->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
       API_ID_PPB_CORE, old_image_data));
 }
 
 }  // namespace proxy
 }  // namespace ppapi