OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ | 5 #ifndef WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ |
6 #define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ | 6 #define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 | 72 |
73 scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> | 73 scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> |
74 context3d_; | 74 context3d_; |
75 scoped_ptr<GrContextForWebGraphicsContext3D> gr_context_; | 75 scoped_ptr<GrContextForWebGraphicsContext3D> gr_context_; |
76 | 76 |
77 LostContextCallback lost_context_callback_; | 77 LostContextCallback lost_context_callback_; |
78 | 78 |
79 base::Lock destroyed_lock_; | 79 base::Lock destroyed_lock_; |
80 bool destroyed_; | 80 bool destroyed_; |
81 | 81 |
| 82 base::Lock context_lock_; |
82 std::string debug_name_; | 83 std::string debug_name_; |
83 class LostContextCallbackProxy; | 84 class LostContextCallbackProxy; |
84 scoped_ptr<LostContextCallbackProxy> lost_context_callback_proxy_; | 85 scoped_ptr<LostContextCallbackProxy> lost_context_callback_proxy_; |
85 | 86 |
86 cc::ContextProvider::Capabilities capabilities_; | 87 cc::ContextProvider::Capabilities capabilities_; |
87 | 88 |
88 DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess); | 89 DISALLOW_COPY_AND_ASSIGN(ContextProviderInProcess); |
89 }; | 90 }; |
90 | 91 |
91 } // namespace gpu | 92 } // namespace gpu |
92 } // namespace webkit | 93 } // namespace webkit |
93 | 94 |
94 #endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ | 95 #endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ |
OLD | NEW |