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

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

Issue 2915673003: ui/gfx: Use separate components for color_space and switches (Closed)
Patch Set: Review feedback Created 3 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 | « content/test/layouttest_support.cc ('k') | ui/compositor/compositor_util.cc » ('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 #include "ui/compositor/compositor.h" 5 #include "ui/compositor/compositor.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <deque> 10 #include <deque>
(...skipping 25 matching lines...) Expand all
36 #include "cc/trees/layer_tree_settings.h" 36 #include "cc/trees/layer_tree_settings.h"
37 #include "third_party/skia/include/core/SkBitmap.h" 37 #include "third_party/skia/include/core/SkBitmap.h"
38 #include "ui/compositor/compositor_observer.h" 38 #include "ui/compositor/compositor_observer.h"
39 #include "ui/compositor/compositor_switches.h" 39 #include "ui/compositor/compositor_switches.h"
40 #include "ui/compositor/compositor_vsync_manager.h" 40 #include "ui/compositor/compositor_vsync_manager.h"
41 #include "ui/compositor/dip_util.h" 41 #include "ui/compositor/dip_util.h"
42 #include "ui/compositor/layer.h" 42 #include "ui/compositor/layer.h"
43 #include "ui/compositor/layer_animator_collection.h" 43 #include "ui/compositor/layer_animator_collection.h"
44 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 44 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
45 #include "ui/display/display_switches.h" 45 #include "ui/display/display_switches.h"
46 #include "ui/gfx/color_space_switches.h"
46 #include "ui/gfx/icc_profile.h" 47 #include "ui/gfx/icc_profile.h"
47 #include "ui/gfx/switches.h" 48 #include "ui/gfx/switches.h"
48 #include "ui/gl/gl_switches.h" 49 #include "ui/gl/gl_switches.h"
49 50
50 namespace ui { 51 namespace ui {
51 52
52 Compositor::Compositor(const cc::FrameSinkId& frame_sink_id, 53 Compositor::Compositor(const cc::FrameSinkId& frame_sink_id,
53 ui::ContextFactory* context_factory, 54 ui::ContextFactory* context_factory,
54 ui::ContextFactoryPrivate* context_factory_private, 55 ui::ContextFactoryPrivate* context_factory_private,
55 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 56 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 void Compositor::TimeoutLocks() { 569 void Compositor::TimeoutLocks() {
569 // Make a copy, we're going to cause |active_locks_| to become 570 // Make a copy, we're going to cause |active_locks_| to become
570 // empty. 571 // empty.
571 std::vector<CompositorLock*> locks = active_locks_; 572 std::vector<CompositorLock*> locks = active_locks_;
572 for (auto* lock : locks) 573 for (auto* lock : locks)
573 lock->TimeoutLock(); 574 lock->TimeoutLock();
574 DCHECK(active_locks_.empty()); 575 DCHECK(active_locks_.empty());
575 } 576 }
576 577
577 } // namespace ui 578 } // namespace ui
OLDNEW
« no previous file with comments | « content/test/layouttest_support.cc ('k') | ui/compositor/compositor_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698