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

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

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: format Created 4 years, 3 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 24 matching lines...) Expand all
35 namespace base { 35 namespace base {
36 class RunLoop; 36 class RunLoop;
37 class SingleThreadTaskRunner; 37 class SingleThreadTaskRunner;
38 } 38 }
39 39
40 namespace cc { 40 namespace cc {
41 class AnimationTimeline; 41 class AnimationTimeline;
42 class ContextProvider; 42 class ContextProvider;
43 class Layer; 43 class Layer;
44 class LayerTreeDebugState; 44 class LayerTreeDebugState;
45 class LayerTreeHost; 45 class LayerTreeHostInterface;
46 class RendererSettings; 46 class RendererSettings;
47 class SharedBitmapManager; 47 class SharedBitmapManager;
48 class SurfaceIdAllocator; 48 class SurfaceIdAllocator;
49 class SurfaceManager; 49 class SurfaceManager;
50 class TaskGraphRunner; 50 class TaskGraphRunner;
51 } 51 }
52 52
53 namespace gfx { 53 namespace gfx {
54 class Rect; 54 class Rect;
55 class ScrollOffset; 55 class ScrollOffset;
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 gfx::AcceleratedWidget widget_; 409 gfx::AcceleratedWidget widget_;
410 #if defined(USE_AURA) 410 #if defined(USE_AURA)
411 ui::Window* window_; 411 ui::Window* window_;
412 #endif 412 #endif
413 // A map from child id to parent id. 413 // A map from child id to parent id.
414 std::unordered_map<uint32_t, uint32_t> surface_clients_; 414 std::unordered_map<uint32_t, uint32_t> surface_clients_;
415 bool widget_valid_; 415 bool widget_valid_;
416 bool output_surface_requested_; 416 bool output_surface_requested_;
417 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 417 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
418 scoped_refptr<cc::Layer> root_web_layer_; 418 scoped_refptr<cc::Layer> root_web_layer_;
419 std::unique_ptr<cc::LayerTreeHost> host_; 419 std::unique_ptr<cc::LayerTreeHostInterface> host_;
danakj 2016/09/08 20:58:46 It's always an inprocess LTH for ui::Compositor, s
Khushal 2016/09/08 22:05:24 This is probably not decided at all, but what's go
danakj 2016/09/08 22:37:12 If MUS was just the DisplayCompositor, it would re
Khushal 2016/09/08 23:56:05 Okay, sounds good.
420 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 420 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
421 421
422 // The manager of vsync parameters for this compositor. 422 // The manager of vsync parameters for this compositor.
423 scoped_refptr<CompositorVSyncManager> vsync_manager_; 423 scoped_refptr<CompositorVSyncManager> vsync_manager_;
424 424
425 // The device scale factor of the monitor that this compositor is compositing 425 // The device scale factor of the monitor that this compositor is compositing
426 // layers on. 426 // layers on.
427 float device_scale_factor_; 427 float device_scale_factor_;
428 428
429 bool locks_will_time_out_; 429 bool locks_will_time_out_;
430 CompositorLock* compositor_lock_; 430 CompositorLock* compositor_lock_;
431 431
432 LayerAnimatorCollection layer_animator_collection_; 432 LayerAnimatorCollection layer_animator_collection_;
433 scoped_refptr<cc::AnimationTimeline> animation_timeline_; 433 scoped_refptr<cc::AnimationTimeline> animation_timeline_;
434 434
435 base::WeakPtrFactory<Compositor> weak_ptr_factory_; 435 base::WeakPtrFactory<Compositor> weak_ptr_factory_;
436 436
437 DISALLOW_COPY_AND_ASSIGN(Compositor); 437 DISALLOW_COPY_AND_ASSIGN(Compositor);
438 }; 438 };
439 439
440 } // namespace ui 440 } // namespace ui
441 441
442 #endif // UI_COMPOSITOR_COMPOSITOR_H_ 442 #endif // UI_COMPOSITOR_COMPOSITOR_H_
OLDNEW
« cc/trees/layer_tree_host.cc ('K') | « ui/android/resources/resource_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698