content/browser/android/content_startup_flags.cc - Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction.

Side by Side Diff: content/browser/android/content_startup_flags.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 7 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

« android_webview/browser/hardware_renderer.cc ('K') | « content/browser/android/composited_touch_handle_drawable.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "content/browser/android/content_startup_flags.h"	5 #include "content/browser/android/content_startup_flags.h"

6	6

7 #include "base/android/build_info.h"	7 #include "base/android/build_info.h"

8 #include "base/base_switches.h"	8 #include "base/base_switches.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "base/sys_info.h"	12 #include "base/sys_info.h"

13 #include "cc/base/switches.h"	13 #include "cc/base/switches.h"

	14 #include "cc/trees/layer_tree_settings.h"

	15 #include "content/public/browser/android/compositor.h"

14 #include "content/public/browser/render_process_host.h"	16 #include "content/public/browser/render_process_host.h"

15 #include "content/public/common/content_constants.h"	17 #include "content/public/common/content_constants.h"

16 #include "content/public/common/content_switches.h"	18 #include "content/public/common/content_switches.h"

17 #include "gpu/command_buffer/service/gpu_switches.h"	19 #include "gpu/command_buffer/service/gpu_switches.h"

18 #include "ui/base/ui_base_switches.h"	20 #include "ui/base/ui_base_switches.h"

19 #include "ui/native_theme/native_theme_switches.h"	21 #include "ui/native_theme/native_theme_switches.h"

20	22

21 namespace content {	23 namespace content {

22	24

23 void SetContentCommandLineFlags(bool single_process,	25 void SetContentCommandLineFlags(bool single_process,

(...skipping 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 if (!plugin_descriptor.empty()) {	88 if (!plugin_descriptor.empty()) {

87 parsed_command_line->AppendSwitchNative(	89 parsed_command_line->AppendSwitchNative(

88 switches::kRegisterPepperPlugins, plugin_descriptor);	90 switches::kRegisterPepperPlugins, plugin_descriptor);

89 }	91 }

90	92

91 // Disable profiler timing by default.	93 // Disable profiler timing by default.

92 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {	94 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {

93 parsed_command_line->AppendSwitchASCII(	95 parsed_command_line->AppendSwitchASCII(

94 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);	96 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);

95 }	97 }

	98

	99 cc::LayerSettings layer_settings;

	100 if (parsed_command_line->HasSwitch(

	101 switches::kEnableAndroidCompositorAnimationTimelines))

	102 layer_settings.use_compositor_animation_timelines = true;

	103 Compositor::SetLayerSettings(layer_settings);

96 }	104 }

97	105

98 } // namespace content	106 } // namespace content

OLD	NEW