| 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 UI_COMPOSITOR_COMPOSITOR_H_ | 5 #ifndef UI_COMPOSITOR_COMPOSITOR_H_ |
| 6 #define UI_COMPOSITOR_COMPOSITOR_H_ | 6 #define UI_COMPOSITOR_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 | 408 |
| 409 gfx::AcceleratedWidget widget_; | 409 gfx::AcceleratedWidget widget_; |
| 410 #if defined(USE_AURA) | 410 #if defined(USE_AURA) |
| 411 ui::Window* window_; | 411 ui::Window* window_; |
| 412 #endif | 412 #endif |
| 413 // A map from child id to parent id. | 413 // A map from child id to parent id. |
| 414 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> child_frame_sinks_; | 414 std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash> child_frame_sinks_; |
| 415 bool widget_valid_; | 415 bool widget_valid_; |
| 416 bool compositor_frame_sink_requested_; | 416 bool compositor_frame_sink_requested_; |
| 417 const cc::FrameSinkId frame_sink_id_; | 417 const cc::FrameSinkId frame_sink_id_; |
| 418 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; | |
| 419 scoped_refptr<cc::Layer> root_web_layer_; | 418 scoped_refptr<cc::Layer> root_web_layer_; |
| 420 std::unique_ptr<cc::LayerTreeHost> host_; | 419 std::unique_ptr<cc::LayerTreeHost> host_; |
| 421 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 420 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 422 | 421 |
| 423 // The manager of vsync parameters for this compositor. | 422 // The manager of vsync parameters for this compositor. |
| 424 scoped_refptr<CompositorVSyncManager> vsync_manager_; | 423 scoped_refptr<CompositorVSyncManager> vsync_manager_; |
| 425 | 424 |
| 426 // The device scale factor of the monitor that this compositor is compositing | 425 // The device scale factor of the monitor that this compositor is compositing |
| 427 // layers on. | 426 // layers on. |
| 428 float device_scale_factor_; | 427 float device_scale_factor_; |
| 429 | 428 |
| 430 bool locks_will_time_out_; | 429 bool locks_will_time_out_; |
| 431 CompositorLock* compositor_lock_; | 430 CompositorLock* compositor_lock_; |
| 432 | 431 |
| 433 LayerAnimatorCollection layer_animator_collection_; | 432 LayerAnimatorCollection layer_animator_collection_; |
| 434 scoped_refptr<cc::AnimationTimeline> animation_timeline_; | 433 scoped_refptr<cc::AnimationTimeline> animation_timeline_; |
| 435 | 434 |
| 436 gfx::ColorSpace color_space_; | 435 gfx::ColorSpace color_space_; |
| 437 | 436 |
| 438 base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 437 base::WeakPtrFactory<Compositor> weak_ptr_factory_; |
| 439 | 438 |
| 440 DISALLOW_COPY_AND_ASSIGN(Compositor); | 439 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 441 }; | 440 }; |
| 442 | 441 |
| 443 } // namespace ui | 442 } // namespace ui |
| 444 | 443 |
| 445 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 444 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |