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

Side by Side Diff: ui/android/window_android_compositor.cc

Issue 1462613002: Move cc::LayerSettings to cc/layers/layer_settings.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc_perftests Created 5 years, 1 month 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/android/DEPS ('k') | ui/compositor/layer.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/window_android_compositor.h" 5 #include "ui/android/window_android_compositor.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "cc/trees/layer_tree_settings.h" 8 #include "cc/layers/layer_settings.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 namespace { 12 namespace {
13 base::LazyInstance<cc::LayerSettings> g_layer_settings = 13 base::LazyInstance<cc::LayerSettings> g_layer_settings =
14 LAZY_INSTANCE_INITIALIZER; 14 LAZY_INSTANCE_INITIALIZER;
15 } // anonymous namespace 15 } // anonymous namespace
16 16
17 // static 17 // static
18 const cc::LayerSettings& WindowAndroidCompositor::LayerSettings() { 18 const cc::LayerSettings& WindowAndroidCompositor::LayerSettings() {
19 return g_layer_settings.Get(); 19 return g_layer_settings.Get();
20 } 20 }
21 21
22 // static 22 // static
23 void WindowAndroidCompositor::SetLayerSettings( 23 void WindowAndroidCompositor::SetLayerSettings(
24 const cc::LayerSettings& settings) { 24 const cc::LayerSettings& settings) {
25 g_layer_settings.Get() = settings; 25 g_layer_settings.Get() = settings;
26 } 26 }
27 27
28 } // namespace ui 28 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/DEPS ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698