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

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

Issue 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 #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/sys_info.h" 11 #include "base/sys_info.h"
12 #include "cc/base/switches.h" 12 #include "cc/base/switches.h"
13 #include "cc/layers/layer_settings.h"
14 #include "content/public/browser/android/compositor.h" 13 #include "content/public/browser/android/compositor.h"
15 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
16 #include "gpu/command_buffer/service/gpu_switches.h" 15 #include "gpu/command_buffer/service/gpu_switches.h"
17 #include "ui/base/ui_base_switches.h" 16 #include "ui/base/ui_base_switches.h"
18 #include "ui/native_theme/native_theme_switches.h" 17 #include "ui/native_theme/native_theme_switches.h"
19 18
20 namespace content { 19 namespace content {
21 20
22 void SetContentCommandLineFlags(bool single_process, 21 void SetContentCommandLineFlags(bool single_process,
23 const std::string& plugin_descriptor) { 22 const std::string& plugin_descriptor) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 if (!plugin_descriptor.empty()) { 71 if (!plugin_descriptor.empty()) {
73 parsed_command_line->AppendSwitchNative( 72 parsed_command_line->AppendSwitchNative(
74 switches::kRegisterPepperPlugins, plugin_descriptor); 73 switches::kRegisterPepperPlugins, plugin_descriptor);
75 } 74 }
76 75
77 // Disable profiler timing by default. 76 // Disable profiler timing by default.
78 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) { 77 if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {
79 parsed_command_line->AppendSwitchASCII( 78 parsed_command_line->AppendSwitchASCII(
80 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); 79 switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
81 } 80 }
82
83 cc::LayerSettings layer_settings;
84 layer_settings.use_compositor_animation_timelines =
85 !parsed_command_line->HasSwitch(
86 switches::kDisableAndroidCompositorAnimationTimelines);
87 Compositor::SetLayerSettings(layer_settings);
88 } 81 }
89 82
90 } // namespace content 83 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/composited_touch_handle_drawable.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698