Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: ui/compositor/compositor.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/chromeos/network/network_icon_animation.h ('k') | ui/compositor/compositor_vsync_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 // Called to release any pending CompositorLock 327 // Called to release any pending CompositorLock
328 void CancelCompositorLock(); 328 void CancelCompositorLock();
329 329
330 gfx::Size size_; 330 gfx::Size size_;
331 331
332 ui::ContextFactory* context_factory_; 332 ui::ContextFactory* context_factory_;
333 333
334 // The root of the Layer tree drawn by this compositor. 334 // The root of the Layer tree drawn by this compositor.
335 Layer* root_layer_; 335 Layer* root_layer_;
336 336
337 ObserverList<CompositorObserver, true> observer_list_; 337 base::ObserverList<CompositorObserver, true> observer_list_;
338 ObserverList<CompositorAnimationObserver> animation_observer_list_; 338 base::ObserverList<CompositorAnimationObserver> animation_observer_list_;
339 std::list<CompositorBeginFrameObserver*> begin_frame_observer_list_; 339 std::list<CompositorBeginFrameObserver*> begin_frame_observer_list_;
340 340
341 gfx::AcceleratedWidget widget_; 341 gfx::AcceleratedWidget widget_;
342 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 342 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
343 scoped_refptr<cc::Layer> root_web_layer_; 343 scoped_refptr<cc::Layer> root_web_layer_;
344 scoped_ptr<cc::LayerTreeHost> host_; 344 scoped_ptr<cc::LayerTreeHost> host_;
345 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 345 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
346 346
347 // The manager of vsync parameters for this compositor. 347 // The manager of vsync parameters for this compositor.
348 scoped_refptr<CompositorVSyncManager> vsync_manager_; 348 scoped_refptr<CompositorVSyncManager> vsync_manager_;
(...skipping 14 matching lines...) Expand all
363 cc::BeginFrameArgs missed_begin_frame_args_; 363 cc::BeginFrameArgs missed_begin_frame_args_;
364 364
365 base::WeakPtrFactory<Compositor> weak_ptr_factory_; 365 base::WeakPtrFactory<Compositor> weak_ptr_factory_;
366 366
367 DISALLOW_COPY_AND_ASSIGN(Compositor); 367 DISALLOW_COPY_AND_ASSIGN(Compositor);
368 }; 368 };
369 369
370 } // namespace ui 370 } // namespace ui
371 371
372 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 372 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon_animation.h ('k') | ui/compositor/compositor_vsync_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698