| 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 <list> |  | 
| 9 #include <string> | 8 #include <string> | 
| 10 | 9 | 
| 11 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" | 
| 12 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" | 
| 13 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" | 
| 14 #include "base/observer_list.h" | 13 #include "base/observer_list.h" | 
| 15 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" | 
| 16 #include "base/time/time.h" | 15 #include "base/time/time.h" | 
| 17 #include "cc/output/begin_frame_args.h" | 16 #include "cc/output/begin_frame_args.h" | 
| 18 #include "cc/surfaces/surface_sequence.h" | 17 #include "cc/surfaces/surface_sequence.h" | 
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 337 | 336 | 
| 338   gfx::Size size_; | 337   gfx::Size size_; | 
| 339 | 338 | 
| 340   ui::ContextFactory* context_factory_; | 339   ui::ContextFactory* context_factory_; | 
| 341 | 340 | 
| 342   // The root of the Layer tree drawn by this compositor. | 341   // The root of the Layer tree drawn by this compositor. | 
| 343   Layer* root_layer_; | 342   Layer* root_layer_; | 
| 344 | 343 | 
| 345   base::ObserverList<CompositorObserver, true> observer_list_; | 344   base::ObserverList<CompositorObserver, true> observer_list_; | 
| 346   base::ObserverList<CompositorAnimationObserver> animation_observer_list_; | 345   base::ObserverList<CompositorAnimationObserver> animation_observer_list_; | 
| 347   std::list<CompositorBeginFrameObserver*> begin_frame_observer_list_; | 346   base::ObserverList<CompositorBeginFrameObserver, true> | 
|  | 347       begin_frame_observer_list_; | 
| 348 | 348 | 
| 349   gfx::AcceleratedWidget widget_; | 349   gfx::AcceleratedWidget widget_; | 
| 350   bool widget_valid_; | 350   bool widget_valid_; | 
| 351   bool output_surface_requested_; | 351   bool output_surface_requested_; | 
| 352   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; | 352   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; | 
| 353   scoped_refptr<cc::Layer> root_web_layer_; | 353   scoped_refptr<cc::Layer> root_web_layer_; | 
| 354   scoped_ptr<cc::LayerTreeHost> host_; | 354   scoped_ptr<cc::LayerTreeHost> host_; | 
| 355   scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 355   scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 
| 356 | 356 | 
| 357   // The manager of vsync parameters for this compositor. | 357   // The manager of vsync parameters for this compositor. | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 373   cc::BeginFrameArgs missed_begin_frame_args_; | 373   cc::BeginFrameArgs missed_begin_frame_args_; | 
| 374 | 374 | 
| 375   base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 375   base::WeakPtrFactory<Compositor> weak_ptr_factory_; | 
| 376 | 376 | 
| 377   DISALLOW_COPY_AND_ASSIGN(Compositor); | 377   DISALLOW_COPY_AND_ASSIGN(Compositor); | 
| 378 }; | 378 }; | 
| 379 | 379 | 
| 380 }  // namespace ui | 380 }  // namespace ui | 
| 381 | 381 | 
| 382 #endif  // UI_COMPOSITOR_COMPOSITOR_H_ | 382 #endif  // UI_COMPOSITOR_COMPOSITOR_H_ | 
| OLD | NEW | 
|---|