OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_AUDIO_HELPER_H_ | 5 #ifndef CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ |
6 #define CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ | 6 #define CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
| 11 #include <memory> |
| 12 |
11 #include "base/macros.h" | 13 #include "base/macros.h" |
12 #include "base/memory/scoped_ptr.h" | |
13 #include "base/memory/shared_memory.h" | 14 #include "base/memory/shared_memory.h" |
14 #include "base/sync_socket.h" | 15 #include "base/sync_socket.h" |
15 #include "ppapi/c/pp_completion_callback.h" | 16 #include "ppapi/c/pp_completion_callback.h" |
16 #include "ppapi/shared_impl/resource.h" | 17 #include "ppapi/shared_impl/resource.h" |
17 #include "ppapi/shared_impl/scoped_pp_resource.h" | 18 #include "ppapi/shared_impl/scoped_pp_resource.h" |
18 #include "ppapi/shared_impl/tracked_callback.h" | 19 #include "ppapi/shared_impl/tracked_callback.h" |
19 | 20 |
20 namespace content { | 21 namespace content { |
21 | 22 |
22 class AudioHelper { | 23 class AudioHelper { |
(...skipping 20 matching lines...) Expand all Loading... |
43 size_t shared_memory_size, | 44 size_t shared_memory_size, |
44 base::SyncSocket::Handle socket_handle) = 0; | 45 base::SyncSocket::Handle socket_handle) = 0; |
45 | 46 |
46 private: | 47 private: |
47 scoped_refptr<ppapi::TrackedCallback> create_callback_; | 48 scoped_refptr<ppapi::TrackedCallback> create_callback_; |
48 | 49 |
49 // When a create callback is being issued, these will save the info for | 50 // When a create callback is being issued, these will save the info for |
50 // querying from the callback. The proxy uses this to get the handles to the | 51 // querying from the callback. The proxy uses this to get the handles to the |
51 // other process instead of mapping them in the renderer. These will be | 52 // other process instead of mapping them in the renderer. These will be |
52 // invalid all other times. | 53 // invalid all other times. |
53 scoped_ptr<base::SharedMemory> shared_memory_for_create_callback_; | 54 std::unique_ptr<base::SharedMemory> shared_memory_for_create_callback_; |
54 size_t shared_memory_size_for_create_callback_; | 55 size_t shared_memory_size_for_create_callback_; |
55 scoped_ptr<base::SyncSocket> socket_for_create_callback_; | 56 std::unique_ptr<base::SyncSocket> socket_for_create_callback_; |
56 | 57 |
57 DISALLOW_COPY_AND_ASSIGN(AudioHelper); | 58 DISALLOW_COPY_AND_ASSIGN(AudioHelper); |
58 }; | 59 }; |
59 | 60 |
60 } // namespace content | 61 } // namespace content |
61 | 62 |
62 #endif // CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ | 63 #endif // CONTENT_RENDERER_PEPPER_AUDIO_HELPER_H_ |
OLD | NEW |