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

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

Issue 999173004: cc: Move worker threads to content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: some cleanup Created 5 years, 9 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
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 <string> 8 #include <string>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 10 matching lines...) Expand all
21 #include "ui/compositor/compositor_export.h" 21 #include "ui/compositor/compositor_export.h"
22 #include "ui/compositor/compositor_observer.h" 22 #include "ui/compositor/compositor_observer.h"
23 #include "ui/compositor/layer_animator_collection.h" 23 #include "ui/compositor/layer_animator_collection.h"
24 #include "ui/gfx/geometry/size.h" 24 #include "ui/gfx/geometry/size.h"
25 #include "ui/gfx/geometry/vector2d.h" 25 #include "ui/gfx/geometry/vector2d.h"
26 #include "ui/gfx/native_widget_types.h" 26 #include "ui/gfx/native_widget_types.h"
27 27
28 namespace base { 28 namespace base {
29 class MessageLoopProxy; 29 class MessageLoopProxy;
30 class RunLoop; 30 class RunLoop;
31 class SimpleThread;
31 } 32 }
32 33
33 namespace cc { 34 namespace cc {
34 class ContextProvider; 35 class ContextProvider;
35 class Layer; 36 class Layer;
36 class LayerTreeDebugState; 37 class LayerTreeDebugState;
37 class LayerTreeHost; 38 class LayerTreeHost;
38 class RendererSettings; 39 class RendererSettings;
39 class SharedBitmapManager; 40 class SharedBitmapManager;
40 class SurfaceIdAllocator; 41 class SurfaceIdAllocator;
42 class TaskGraphRunner;
41 } 43 }
42 44
43 namespace gfx { 45 namespace gfx {
44 class Rect; 46 class Rect;
45 class Size; 47 class Size;
46 } 48 }
47 49
48 namespace gpu { 50 namespace gpu {
49 class GpuMemoryBufferManager; 51 class GpuMemoryBufferManager;
50 struct Mailbox; 52 struct Mailbox;
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 Layer* root_layer_; 311 Layer* root_layer_;
310 312
311 ObserverList<CompositorObserver, true> observer_list_; 313 ObserverList<CompositorObserver, true> observer_list_;
312 ObserverList<CompositorAnimationObserver> animation_observer_list_; 314 ObserverList<CompositorAnimationObserver> animation_observer_list_;
313 315
314 gfx::AcceleratedWidget widget_; 316 gfx::AcceleratedWidget widget_;
315 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 317 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
316 scoped_refptr<cc::Layer> root_web_layer_; 318 scoped_refptr<cc::Layer> root_web_layer_;
317 scoped_ptr<cc::LayerTreeHost> host_; 319 scoped_ptr<cc::LayerTreeHost> host_;
318 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 320 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
321 scoped_ptr<cc::TaskGraphRunner> task_graph_runner_;
322 scoped_ptr<base::SimpleThread> raster_thread_;
319 323
320 // The manager of vsync parameters for this compositor. 324 // The manager of vsync parameters for this compositor.
321 scoped_refptr<CompositorVSyncManager> vsync_manager_; 325 scoped_refptr<CompositorVSyncManager> vsync_manager_;
322 326
323 // The device scale factor of the monitor that this compositor is compositing 327 // The device scale factor of the monitor that this compositor is compositing
324 // layers on. 328 // layers on.
325 float device_scale_factor_; 329 float device_scale_factor_;
326 330
327 int last_started_frame_; 331 int last_started_frame_;
328 int last_ended_frame_; 332 int last_ended_frame_;
329 333
330 bool locks_will_time_out_; 334 bool locks_will_time_out_;
331 CompositorLock* compositor_lock_; 335 CompositorLock* compositor_lock_;
332 336
333 LayerAnimatorCollection layer_animator_collection_; 337 LayerAnimatorCollection layer_animator_collection_;
334 338
335 base::WeakPtrFactory<Compositor> weak_ptr_factory_; 339 base::WeakPtrFactory<Compositor> weak_ptr_factory_;
336 340
337 DISALLOW_COPY_AND_ASSIGN(Compositor); 341 DISALLOW_COPY_AND_ASSIGN(Compositor);
338 }; 342 };
339 343
340 } // namespace ui 344 } // namespace ui
341 345
342 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 346 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698