| 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/containers/hash_tables.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
| 14 #include "base/time.h" | 14 #include "base/time.h" |
| 15 #include "cc/trees/layer_tree_host_client.h" | 15 #include "cc/trees/layer_tree_host_client.h" |
| 16 #include "third_party/skia/include/core/SkColor.h" | 16 #include "third_party/skia/include/core/SkColor.h" |
| 17 #include "ui/compositor/compositor_export.h" | 17 #include "ui/compositor/compositor_export.h" |
| 18 #include "ui/compositor/compositor_observer.h" | 18 #include "ui/compositor/compositor_observer.h" |
| 19 #include "ui/gfx/native_widget_types.h" | 19 #include "ui/gfx/native_widget_types.h" |
| 20 #include "ui/gfx/size.h" | 20 #include "ui/gfx/size.h" |
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 bool disable_schedule_composite_; | 448 bool disable_schedule_composite_; |
| 449 | 449 |
| 450 CompositorLock* compositor_lock_; | 450 CompositorLock* compositor_lock_; |
| 451 | 451 |
| 452 DISALLOW_COPY_AND_ASSIGN(Compositor); | 452 DISALLOW_COPY_AND_ASSIGN(Compositor); |
| 453 }; | 453 }; |
| 454 | 454 |
| 455 } // namespace ui | 455 } // namespace ui |
| 456 | 456 |
| 457 #endif // UI_COMPOSITOR_COMPOSITOR_H_ | 457 #endif // UI_COMPOSITOR_COMPOSITOR_H_ |
| OLD | NEW |