Change trusted shared memory interface to match audio....

webkit/glue/plugins/pepper_image_data.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_image_data.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 61 matching lines @@
     return NULL;
   return image_data->Map();
 }
 
 void Unmap(PP_Resource resource) {
   scoped_refptr<ImageData> image_data(Resource::GetAs<ImageData>(resource));
   if (image_data)
     image_data->Unmap();
 }
 
-uint64_t GetNativeMemoryHandle2(PP_Resource resource, uint32_t* byte_count) {
+int32_t GetSharedMemory(PP_Resource resource,
+                        int* handle,
+                        uint32_t* byte_count) {
   scoped_refptr<ImageData> image_data(Resource::GetAs<ImageData>(resource));
-  if (image_data)
-    return image_data->GetNativeMemoryHandle(byte_count);
-  return 0;
+  if (image_data) {
+    *handle = image_data->GetSharedMemoryHandle(byte_count);
+    return PP_OK;
+  }
+  return PP_ERROR_BADRESOURCE;
 }
 
 const PPB_ImageData ppb_imagedata = {
   &GetNativeImageDataFormat,
   &IsImageDataFormatSupported,
   &Create,
   &IsImageData,
   &Describe,
   &Map,
   &Unmap,
 };
 
 const PPB_ImageDataTrusted ppb_imagedata_trusted = {
-  &GetNativeMemoryHandle2,
+  &GetSharedMemory,
 };
 
 }  // namespace
 
 ImageData::ImageData(PluginModule* module)
     : Resource(module),
       format_(PP_IMAGEDATAFORMAT_BGRA_PREMUL),
       width_(0),
       height_(0) {
 }
@@ skipping 71 matching lines @@
   return bitmap.getAddr32(0, 0);
 }
 
 void ImageData::Unmap() {
   // This is currently unimplemented, which is OK. The data will just always
   // be around once it's mapped. Chrome's TransportDIB isn't currently
   // unmappable without freeing it, but this may be something we want to support
   // in the future to save some memory.
 }
 
-uint64 ImageData::GetNativeMemoryHandle(uint32* byte_count) const {
+int ImageData::GetSharedMemoryHandle(uint32* byte_count) const {
   return platform_image_->GetSharedMemoryHandle(byte_count);
 }
 
 const SkBitmap* ImageData::GetMappedBitmap() const {
   if (!mapped_canvas_.get())
     return NULL;
   return &mapped_canvas_->getTopPlatformDevice().accessBitmap(false);
 }
 
 void ImageData::Swap(ImageData* other) {
   swap(other->platform_image_, platform_image_);
   swap(other->mapped_canvas_, mapped_canvas_);
   std::swap(other->format_, format_);
   std::swap(other->width_, width_);
   std::swap(other->height_, height_);
 }
 
 }  // namespace pepper