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

Side by Side Diff: content/renderer/pepper/ppb_buffer_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, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 18 matching lines...) Expand all
29 // Resource overrides. 29 // Resource overrides.
30 ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() override; 30 ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() override;
31 31
32 // PPB_Buffer_API implementation. 32 // PPB_Buffer_API implementation.
33 PP_Bool Describe(uint32_t* size_in_bytes) override; 33 PP_Bool Describe(uint32_t* size_in_bytes) override;
34 PP_Bool IsMapped() override; 34 PP_Bool IsMapped() override;
35 void* Map() override; 35 void* Map() override;
36 void Unmap() override; 36 void Unmap() override;
37 37
38 // Trusted. 38 // Trusted.
39 int32_t GetSharedMemory(int* handle) override; 39 int32_t GetSharedMemory(base::SharedMemory** shm) override;
40 40
41 private: 41 private:
42 ~PPB_Buffer_Impl() override; 42 ~PPB_Buffer_Impl() override;
43 43
44 explicit PPB_Buffer_Impl(PP_Instance instance); 44 explicit PPB_Buffer_Impl(PP_Instance instance);
45 bool Init(uint32_t size); 45 bool Init(uint32_t size);
46 46
47 scoped_ptr<base::SharedMemory> shared_memory_; 47 scoped_ptr<base::SharedMemory> shared_memory_;
48 uint32_t size_; 48 uint32_t size_;
49 int map_count_; 49 int map_count_;
(...skipping 19 matching lines...) Expand all
69 69
70 void* data_; 70 void* data_;
71 uint32_t size_; 71 uint32_t size_;
72 72
73 DISALLOW_COPY_AND_ASSIGN(BufferAutoMapper); 73 DISALLOW_COPY_AND_ASSIGN(BufferAutoMapper);
74 }; 74 };
75 75
76 } // namespace content 76 } // namespace content
77 77
78 #endif // CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_ 78 #endif // CONTENT_RENDERER_PEPPER_PPB_BUFFER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698