| 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_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
| 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 | 27 |
| 28 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
| 29 #include "base/win/scoped_handle.h" | 29 #include "base/win/scoped_handle.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 namespace base { | 32 namespace base { |
| 33 class CommandLine; | 33 class CommandLine; |
| 34 class FilePath; | 34 class FilePath; |
| 35 } | 35 } |
| 36 | 36 |
| 37 namespace discardable_memory { |
| 38 class ClientDiscardableSharedMemoryManager; |
| 39 } |
| 40 |
| 37 namespace IPC { | 41 namespace IPC { |
| 38 struct ChannelHandle; | 42 struct ChannelHandle; |
| 39 } | 43 } |
| 40 | 44 |
| 41 namespace content { | 45 namespace content { |
| 42 | 46 |
| 43 class PpapiBlinkPlatformImpl; | 47 class PpapiBlinkPlatformImpl; |
| 44 | 48 |
| 45 #if defined(COMPILER_MSVC) | 49 #if defined(COMPILER_MSVC) |
| 46 // See explanation for other RenderViewHostImpl which is the same issue. | 50 // See explanation for other RenderViewHostImpl which is the same issue. |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 uint32_t next_plugin_dispatcher_id_; | 169 uint32_t next_plugin_dispatcher_id_; |
| 166 | 170 |
| 167 // The BlinkPlatformImpl implementation. | 171 // The BlinkPlatformImpl implementation. |
| 168 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; | 172 std::unique_ptr<PpapiBlinkPlatformImpl> blink_platform_impl_; |
| 169 | 173 |
| 170 #if defined(OS_WIN) | 174 #if defined(OS_WIN) |
| 171 // Caches the handle to the peer process if this is a broker. | 175 // Caches the handle to the peer process if this is a broker. |
| 172 base::win::ScopedHandle peer_handle_; | 176 base::win::ScopedHandle peer_handle_; |
| 173 #endif | 177 #endif |
| 174 | 178 |
| 179 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> |
| 180 discardable_shared_memory_manager_; |
| 181 |
| 175 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); | 182 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); |
| 176 }; | 183 }; |
| 177 | 184 |
| 178 #if defined(COMPILER_MSVC) | 185 #if defined(COMPILER_MSVC) |
| 179 #pragma warning(pop) | 186 #pragma warning(pop) |
| 180 #endif | 187 #endif |
| 181 | 188 |
| 182 } // namespace content | 189 } // namespace content |
| 183 | 190 |
| 184 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 191 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
| OLD | NEW |