| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 // 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 |
| 426 // layers on. | 426 // layers on. |
| 427 float device_scale_factor_; | 427 float device_scale_factor_; |
| 428 | 428 |
| 429 bool locks_will_time_out_; | 429 bool locks_will_time_out_; |
| 430 CompositorLock* compositor_lock_; | 430 CompositorLock* compositor_lock_; |
| 431 | 431 |
| 432 LayerAnimatorCollection layer_animator_collection_; | 432 LayerAnimatorCollection layer_animator_collection_; |
| 433 scoped_refptr<cc::AnimationTimeline> animation_timeline_; | 433 scoped_refptr<cc::AnimationTimeline> animation_timeline_; |
| 434 | 434 |
| 435 gfx::ColorSpace color_space_; |
| 436 |
| 435 base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 437 base::WeakPtrFactory<Compositor> weak_ptr_factory_; |
| 436 | 438 |
| 437 DISALLOW_COPY_AND_ASSIGN(Compositor); | 439 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 438 }; | 440 }; |
| 439 | 441 |
| 440 } // namespace ui | 442 } // namespace ui |
| 441 | 443 |
| 442 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 444 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |