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/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "cc/switches.h" | 10 #include "cc/switches.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing); | 50 parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing); |
51 parsed_command_line->AppendSwitch( | 51 parsed_command_line->AppendSwitch( |
52 switches::kEnableCompositingForFixedPosition); | 52 switches::kEnableCompositingForFixedPosition); |
53 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); | 53 parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll); |
54 parsed_command_line->AppendSwitch( | 54 parsed_command_line->AppendSwitch( |
55 switches::kEnableAcceleratedScrollableFrames); | 55 switches::kEnableAcceleratedScrollableFrames); |
56 parsed_command_line->AppendSwitch( | 56 parsed_command_line->AppendSwitch( |
57 switches::kEnableCompositedScrollingForFrames); | 57 switches::kEnableCompositedScrollingForFrames); |
58 | 58 |
59 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); | 59 parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight); |
60 parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch); | 60 parsed_command_line->AppendSwitch(switches::kEnablePinch); |
61 if (!parsed_command_line->HasSwitch(cc::switches::kEnableImplSidePainting)) | |
62 parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch); | |
danakj
2013/01/17 18:02:49
nit: 2 space indent
aelias_OOO_until_Jul13
2013/01/17 19:59:46
Done.
| |
61 | 63 |
62 // Run the GPU service as a thread in the browser instead of as a | 64 // Run the GPU service as a thread in the browser instead of as a |
63 // standalone process. | 65 // standalone process. |
64 parsed_command_line->AppendSwitch(switches::kInProcessGPU); | 66 parsed_command_line->AppendSwitch(switches::kInProcessGPU); |
65 | 67 |
66 // Always use fixed layout and viewport tag. | 68 // Always use fixed layout and viewport tag. |
67 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); | 69 parsed_command_line->AppendSwitch(switches::kEnableFixedLayout); |
68 parsed_command_line->AppendSwitch(switches::kEnableViewport); | 70 parsed_command_line->AppendSwitch(switches::kEnableViewport); |
69 | 71 |
70 // FIXME(aelias): Commented out due to flaky tests. | 72 // FIXME(aelias): Commented out due to flaky tests. |
71 // parsed_command_line->AppendSwitch( | 73 // parsed_command_line->AppendSwitch( |
72 // cc::switches::kEnableCompositorFrameMessage); | 74 // cc::switches::kEnableCompositorFrameMessage); |
73 } | 75 } |
74 | 76 |
75 } // namespace content | 77 } // namespace content |
OLD | NEW |