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/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/string_split.h" | 8 #include "base/string_split.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 } | 101 } |
102 | 102 |
103 // Load plugins out-of-process by default. | 103 // Load plugins out-of-process by default. |
104 // We always want flash out-of-process. | 104 // We always want flash out-of-process. |
105 parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess); | 105 parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess); |
106 | 106 |
107 // Run the GPU service as a thread in the browser instead of as a | 107 // Run the GPU service as a thread in the browser instead of as a |
108 // standalone process. | 108 // standalone process. |
109 parsed_command_line->AppendSwitch(switches::kInProcessGPU); | 109 parsed_command_line->AppendSwitch(switches::kInProcessGPU); |
110 | 110 |
111 // Disable WebGL for now (See http://b/5634125) | |
112 parsed_command_line->AppendSwitch(switches::kDisableExperimentalWebGL); | |
113 | |
114 // Always use fixed layout and viewport tag. | 111 // Always use fixed layout and viewport tag. |
115 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); | 112 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); |
116 parsed_command_line->AppendSwitch(switches::kEnableViewport); | 113 parsed_command_line->AppendSwitch(switches::kEnableViewport); |
117 | 114 |
118 // TODO(aelias): switch this to true value of deviceScaleFactor once floats | 115 // TODO(aelias): switch this to true value of deviceScaleFactor once floats |
119 // are supported | 116 // are supported |
120 parsed_command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, | 117 parsed_command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, |
121 "1"); | 118 "1"); |
122 | 119 |
123 // TODO(aelias): Enable these flags once they're merged in from upstream. | 120 // TODO(aelias): Enable these flags once they're merged in from upstream. |
124 // parsed_command_line->AppendSwitch(switches::kEnableTouchEvents); | 121 // parsed_command_line->AppendSwitch(switches::kEnableTouchEvents); |
125 // parsed_command_line->AppendSwitch(switches::kEnablePinch); | 122 // parsed_command_line->AppendSwitch(switches::kEnablePinch); |
126 | 123 |
127 SetPepperCommandLineFlags(plugin_descriptor); | 124 SetPepperCommandLineFlags(plugin_descriptor); |
128 } | 125 } |
129 | 126 |
130 } // namespace content | 127 } // namespace content |
OLD | NEW |