Update pepper to not assume that SharedMemoryHandle is an int.

content/renderer/pepper/ppb_image_data_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
 #include "content/common/content_export.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/shared_impl/ppb_image_data_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 class SkBitmap;
 class SkCanvas;
 class TransportDIB;
@@ skipping 18 matching lines @@
     virtual ~Backend() {};
     virtual bool Init(PPB_ImageData_Impl* impl,
                       PP_ImageDataFormat format,
                       int width,
                       int height,
                       bool init_to_zero) = 0;
     virtual bool IsMapped() const = 0;
     virtual TransportDIB* GetTransportDIB() const = 0;
     virtual void* Map() = 0;
     virtual void Unmap() = 0;
-    virtual int32_t GetSharedMemory(int* handle, uint32_t* byte_count) = 0;
+    virtual int32_t GetSharedMemory(base::SharedMemoryHandle* handle,
+                                    uint32_t* byte_count) = 0;
     virtual SkCanvas* GetPlatformCanvas() = 0;
     virtual SkCanvas* GetCanvas() = 0;
     virtual const SkBitmap* GetMappedBitmap() const = 0;
   };
 
   // If you call this constructor, you must also call Init before use. Normally
   // you should use the static Create function, but this constructor is needed
   // for some internal uses of ImageData (like Graphics2D).
   PPB_ImageData_Impl(PP_Instance instance,
                      PPB_ImageData_Shared::ImageDataType type);
@@ skipping 24 matching lines @@
   bool IsMapped() const;
   TransportDIB* GetTransportDIB() const;
 
   // Resource override.
   ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API() override;
 
   // PPB_ImageData_API implementation.
   PP_Bool Describe(PP_ImageDataDesc* desc) override;
   void* Map() override;
   void Unmap() override;
-  int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override;
+  int32_t GetSharedMemory(base::SharedMemoryHandle* handle,
+                          uint32_t* byte_count) override;
   SkCanvas* GetPlatformCanvas() override;
   SkCanvas* GetCanvas() override;
   void SetIsCandidateForReuse() override;
 
   const SkBitmap* GetMappedBitmap() const;
 
  private:
   ~PPB_ImageData_Impl() override;
 
   PP_ImageDataFormat format_;
@@ skipping 14 matching lines @@
   // PPB_ImageData_Impl::Backend implementation.
   bool Init(PPB_ImageData_Impl* impl,
             PP_ImageDataFormat format,
             int width,
             int height,
             bool init_to_zero) override;
   bool IsMapped() const override;
   TransportDIB* GetTransportDIB() const override;
   void* Map() override;
   void Unmap() override;
-  int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override;
+  int32_t GetSharedMemory(base::SharedMemoryHandle* handle,
+                          uint32_t* byte_count) override;
   SkCanvas* GetPlatformCanvas() override;
   SkCanvas* GetCanvas() override;
   const SkBitmap* GetMappedBitmap() const override;
 
  private:
   // This will be NULL before initialization, and if this PPB_ImageData_Impl is
   // swapped with another.
   int width_;
   int height_;
   scoped_ptr<TransportDIB> dib_;
@@ skipping 12 matching lines @@
   // PPB_ImageData_Impl::Backend implementation.
   bool Init(PPB_ImageData_Impl* impl,
             PP_ImageDataFormat format,
             int width,
             int height,
             bool init_to_zero) override;
   bool IsMapped() const override;
   TransportDIB* GetTransportDIB() const override;
   void* Map() override;
   void Unmap() override;
-  int32_t GetSharedMemory(int* handle, uint32_t* byte_count) override;
+  int32_t GetSharedMemory(base::SharedMemoryHandle* handle,
+                          uint32_t* byte_count) override;
   SkCanvas* GetPlatformCanvas() override;
   SkCanvas* GetCanvas() override;
   const SkBitmap* GetMappedBitmap() const override;
 
  private:
   scoped_ptr<base::SharedMemory> shared_memory_;
   // skia_bitmap_ is backed by shared_memory_.
   SkBitmap skia_bitmap_;
   scoped_ptr<SkCanvas> skia_canvas_;
   uint32 map_count_;
@@ skipping 36 matching lines @@
   PPB_ImageData_Impl* image_data_;
   bool is_valid_;
   bool needs_unmap_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDataAutoMapper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PPB_IMAGE_DATA_IMPL_H_