Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: content/renderer/pepper/ppb_image_data_impl.h

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another nits pass. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/ppb_image_data_impl.h
diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h
index d31e7b1d12cd08058fd97936341c331d8d48ae4f..c8519f40fd59f8aca1175e9a9504a4a958bf8439 100644
--- a/content/renderer/pepper/ppb_image_data_impl.h
+++ b/content/renderer/pepper/ppb_image_data_impl.h
@@ -7,6 +7,7 @@
#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"
@@ -45,7 +46,8 @@ class CONTENT_EXPORT PPB_ImageData_Impl
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;
@@ -90,7 +92,8 @@ class CONTENT_EXPORT PPB_ImageData_Impl
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;
@@ -125,7 +128,8 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend {
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;
@@ -158,7 +162,8 @@ class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend {
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;

Powered by Google App Engine
This is Rietveld 408576698