| 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" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 // we are implementing an embedded WebView. | 55 // we are implementing an embedded WebView. |
| 56 parsed_command_line->AppendSwitch(switches::kSingleProcess); | 56 parsed_command_line->AppendSwitch(switches::kSingleProcess); |
| 57 } | 57 } |
| 58 | 58 |
| 59 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling); | 59 parsed_command_line->AppendSwitch(cc::switches::kEnableBeginFrameScheduling); |
| 60 | 60 |
| 61 parsed_command_line->AppendSwitch(switches::kEnablePinch); | 61 parsed_command_line->AppendSwitch(switches::kEnablePinch); |
| 62 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); | 62 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); |
| 63 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); | 63 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); |
| 64 | 64 |
| 65 // TODO(jdduke): Use the proper SDK version when available, crbug.com/466749. | 65 if (base::android::BuildInfo::GetInstance()->sdk_int() >= |
| 66 if (base::android::BuildInfo::GetInstance()->sdk_int() > | 66 base::android::SDK_VERSION_MARSHMALLOW) { |
| 67 base::android::SDK_VERSION_LOLLIPOP_MR1) { | |
| 68 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); | 67 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); |
| 69 parsed_command_line->AppendSwitchASCII( | 68 parsed_command_line->AppendSwitchASCII( |
| 70 switches::kTouchTextSelectionStrategy, "direction"); | 69 switches::kTouchTextSelectionStrategy, "direction"); |
| 71 } | 70 } |
| 72 | 71 |
| 73 // There is no software fallback on Android, so don't limit GPU crashes. | 72 // There is no software fallback on Android, so don't limit GPU crashes. |
| 74 parsed_command_line->AppendSwitch(switches::kDisableGpuProcessCrashLimit); | 73 parsed_command_line->AppendSwitch(switches::kDisableGpuProcessCrashLimit); |
| 75 | 74 |
| 76 // On legacy low-memory devices the behavior has not been studied with regard | 75 // On legacy low-memory devices the behavior has not been studied with regard |
| 77 // to having an extra process with similar priority as the foreground renderer | 76 // to having an extra process with similar priority as the foreground renderer |
| (...skipping 23 matching lines...) Expand all Loading... |
| 101 } | 100 } |
| 102 | 101 |
| 103 cc::LayerSettings layer_settings; | 102 cc::LayerSettings layer_settings; |
| 104 if (parsed_command_line->HasSwitch( | 103 if (parsed_command_line->HasSwitch( |
| 105 switches::kEnableAndroidCompositorAnimationTimelines)) | 104 switches::kEnableAndroidCompositorAnimationTimelines)) |
| 106 layer_settings.use_compositor_animation_timelines = true; | 105 layer_settings.use_compositor_animation_timelines = true; |
| 107 Compositor::SetLayerSettings(layer_settings); | 106 Compositor::SetLayerSettings(layer_settings); |
| 108 } | 107 } |
| 109 | 108 |
| 110 } // namespace content | 109 } // namespace content |
| OLD | NEW |