| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/hash_tables.h" | 10 #include "base/hash_tables.h" |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 | 348 |
| 349 // The device scale factor of the monitor that this compositor is compositing | 349 // The device scale factor of the monitor that this compositor is compositing |
| 350 // layers on. | 350 // layers on. |
| 351 float device_scale_factor_; | 351 float device_scale_factor_; |
| 352 | 352 |
| 353 int last_started_frame_; | 353 int last_started_frame_; |
| 354 int last_ended_frame_; | 354 int last_ended_frame_; |
| 355 | 355 |
| 356 bool disable_schedule_composite_; | 356 bool disable_schedule_composite_; |
| 357 | 357 |
| 358 bool is_resizing_; |
| 359 |
| 358 CompositorLock* compositor_lock_; | 360 CompositorLock* compositor_lock_; |
| 359 | 361 |
| 360 DISALLOW_COPY_AND_ASSIGN(Compositor); | 362 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 361 }; | 363 }; |
| 362 | 364 |
| 363 } // namespace ui | 365 } // namespace ui |
| 364 | 366 |
| 365 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 367 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |