| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 if (single_process || command_line_renderer_limit == 0) { | 52 if (single_process || command_line_renderer_limit == 0) { |
| 53 // Need to ensure the command line flag is consistent as a lot of chrome | 53 // Need to ensure the command line flag is consistent as a lot of chrome |
| 54 // internal code checks this directly, but it wouldn't normally get set when | 54 // internal code checks this directly, but it wouldn't normally get set when |
| 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::kEnableOverlayFullscreenVideo); | |
| 63 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); | 62 parsed_command_line->AppendSwitch(switches::kEnableOverlayScrollbar); |
| 64 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); | 63 parsed_command_line->AppendSwitch(switches::kValidateInputEventStream); |
| 65 | 64 |
| 66 // TODO(jdduke): Use the proper SDK version when available, crbug.com/466749. | 65 // TODO(jdduke): Use the proper SDK version when available, crbug.com/466749. |
| 67 if (base::android::BuildInfo::GetInstance()->sdk_int() > | 66 if (base::android::BuildInfo::GetInstance()->sdk_int() > |
| 68 base::android::SDK_VERSION_LOLLIPOP_MR1) { | 67 base::android::SDK_VERSION_LOLLIPOP_MR1) { |
| 69 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); | 68 parsed_command_line->AppendSwitch(switches::kEnableLongpressDragSelection); |
| 70 parsed_command_line->AppendSwitchASCII( | 69 parsed_command_line->AppendSwitchASCII( |
| 71 switches::kTouchTextSelectionStrategy, "direction"); | 70 switches::kTouchTextSelectionStrategy, "direction"); |
| 72 } | 71 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 } | 104 } |
| 106 | 105 |
| 107 cc::LayerSettings layer_settings; | 106 cc::LayerSettings layer_settings; |
| 108 if (parsed_command_line->HasSwitch( | 107 if (parsed_command_line->HasSwitch( |
| 109 switches::kEnableAndroidCompositorAnimationTimelines)) | 108 switches::kEnableAndroidCompositorAnimationTimelines)) |
| 110 layer_settings.use_compositor_animation_timelines = true; | 109 layer_settings.use_compositor_animation_timelines = true; |
| 111 Compositor::SetLayerSettings(layer_settings); | 110 Compositor::SetLayerSettings(layer_settings); |
| 112 } | 111 } |
| 113 | 112 |
| 114 } // namespace content | 113 } // namespace content |
| OLD | NEW |