| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 5 #ifndef BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| 6 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 6 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 class Thread; | 26 class Thread; |
| 27 } // namespace base | 27 } // namespace base |
| 28 | 28 |
| 29 namespace cc { | 29 namespace cc { |
| 30 namespace proto { | 30 namespace proto { |
| 31 class CompositorMessage; | 31 class CompositorMessage; |
| 32 } // namespace proto | 32 } // namespace proto |
| 33 | 33 |
| 34 class ContextProvider; | 34 class ContextProvider; |
| 35 class Layer; | 35 class Layer; |
| 36 class LayerTreeHostInterface; | 36 class LayerTreeHost; |
| 37 class LayerTreeSettings; | 37 class LayerTreeSettings; |
| 38 class Surface; | 38 class Surface; |
| 39 class SurfaceFactory; | 39 class SurfaceFactory; |
| 40 class SurfaceId; | 40 class SurfaceId; |
| 41 class SurfaceIdAllocator; | 41 class SurfaceIdAllocator; |
| 42 } // namespace cc | 42 } // namespace cc |
| 43 | 43 |
| 44 namespace blimp { | 44 namespace blimp { |
| 45 class BlimpMessage; | 45 class BlimpMessage; |
| 46 | 46 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 // of the count. | 182 // of the count. |
| 183 void CheckPendingCommitCounts(bool flush); | 183 void CheckPendingCommitCounts(bool flush); |
| 184 | 184 |
| 185 // The unique identifier for the render widget for this compositor. | 185 // The unique identifier for the render widget for this compositor. |
| 186 const int render_widget_id_; | 186 const int render_widget_id_; |
| 187 | 187 |
| 188 BlimpCompositorClient* client_; | 188 BlimpCompositorClient* client_; |
| 189 | 189 |
| 190 BlimpCompositorDependencies* compositor_dependencies_; | 190 BlimpCompositorDependencies* compositor_dependencies_; |
| 191 | 191 |
| 192 std::unique_ptr<cc::LayerTreeHostInterface> host_; | 192 std::unique_ptr<cc::LayerTreeHost> host_; |
| 193 | 193 |
| 194 // The SurfaceFactory is bound to the lifetime of the |proxy_client_|. When | 194 // The SurfaceFactory is bound to the lifetime of the |proxy_client_|. When |
| 195 // detached, the surface factory will be destroyed. | 195 // detached, the surface factory will be destroyed. |
| 196 std::unique_ptr<cc::SurfaceFactory> surface_factory_; | 196 std::unique_ptr<cc::SurfaceFactory> surface_factory_; |
| 197 base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client_; | 197 base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client_; |
| 198 | 198 |
| 199 // Whether or not |host_| has asked for a new CompositorFrameSink. | 199 // Whether or not |host_| has asked for a new CompositorFrameSink. |
| 200 bool compositor_frame_sink_request_pending_; | 200 bool compositor_frame_sink_request_pending_; |
| 201 | 201 |
| 202 // Data for the current frame. | 202 // Data for the current frame. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 | 234 |
| 235 base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_; | 235 base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_; |
| 236 | 236 |
| 237 DISALLOW_COPY_AND_ASSIGN(BlimpCompositor); | 237 DISALLOW_COPY_AND_ASSIGN(BlimpCompositor); |
| 238 }; | 238 }; |
| 239 | 239 |
| 240 } // namespace client | 240 } // namespace client |
| 241 } // namespace blimp | 241 } // namespace blimp |
| 242 | 242 |
| 243 #endif // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ | 243 #endif // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_ |
| OLD | NEW |