OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 static const char optionCheckLayoutTestSystemDeps[] = "--check-layout-test-sys-d
eps"; | 55 static const char optionCheckLayoutTestSystemDeps[] = "--check-layout-test-sys-d
eps"; |
56 | 56 |
57 static const char optionHardwareAcceleratedGL[] = "--enable-hardware-gpu"; | 57 static const char optionHardwareAcceleratedGL[] = "--enable-hardware-gpu"; |
58 static const char optionEnableSoftwareCompositing[] = "--enable-software-composi
ting"; | 58 static const char optionEnableSoftwareCompositing[] = "--enable-software-composi
ting"; |
59 static const char optionEnableThreadedCompositing[] = "--enable-threaded-composi
ting"; | 59 static const char optionEnableThreadedCompositing[] = "--enable-threaded-composi
ting"; |
60 static const char optionForceCompositingMode[] = "--force-compositing-mode"; | 60 static const char optionForceCompositingMode[] = "--force-compositing-mode"; |
61 static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-c
anvas"; | 61 static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-c
anvas"; |
62 static const char optionEnableAcceleratedCompositingForVideo[] = "--enable-accel
erated-video"; | 62 static const char optionEnableAcceleratedCompositingForVideo[] = "--enable-accel
erated-video"; |
63 static const char optionEnableAcceleratedFixedPosition[] = "--enable-accelerated
-fixed-position"; | 63 static const char optionEnableAcceleratedFixedPosition[] = "--enable-accelerated
-fixed-position"; |
64 static const char optionEnableAcceleratedOverflowScroll[] = "--enable-accelerate
d-overflow-scroll"; | 64 static const char optionEnableAcceleratedOverflowScroll[] = "--enable-accelerate
d-overflow-scroll"; |
| 65 static const char optionEnableAcceleratedTransition[] = "--enable-accelerated-tr
ansition"; |
65 static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting"; | 66 static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting"; |
66 static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image
-decoding"; | 67 static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image
-decoding"; |
67 static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-p
arser"; | 68 static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-p
arser"; |
68 | 69 |
69 static const char optionStressOpt[] = "--stress-opt"; | 70 static const char optionStressOpt[] = "--stress-opt"; |
70 static const char optionStressDeopt[] = "--stress-deopt"; | 71 static const char optionStressDeopt[] = "--stress-deopt"; |
71 static const char optionJavaScriptFlags[] = "--js-flags="; | 72 static const char optionJavaScriptFlags[] = "--js-flags="; |
72 static const char optionEncodeBinary[] = "--encode-binary"; | 73 static const char optionEncodeBinary[] = "--encode-binary"; |
73 static const char optionNoTimeout[] = "--no-timeout"; | 74 static const char optionNoTimeout[] = "--no-timeout"; |
74 static const char optionWebCoreLogChannels[] = "--webcore-log-channels="; | 75 static const char optionWebCoreLogChannels[] = "--webcore-log-channels="; |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 | 126 |
126 TestParams params; | 127 TestParams params; |
127 Vector<string> tests; | 128 Vector<string> tests; |
128 bool serverMode = false; | 129 bool serverMode = false; |
129 bool dumpAllPixels = false; | 130 bool dumpAllPixels = false; |
130 bool allowExternalPages = false; | 131 bool allowExternalPages = false; |
131 bool startupDialog = false; | 132 bool startupDialog = false; |
132 bool acceleratedCompositingForVideoEnabled = false; | 133 bool acceleratedCompositingForVideoEnabled = false; |
133 bool acceleratedCompositingForFixedPositionEnabled = false; | 134 bool acceleratedCompositingForFixedPositionEnabled = false; |
134 bool acceleratedCompositingForOverflowScrollEnabled = false; | 135 bool acceleratedCompositingForOverflowScrollEnabled = false; |
| 136 bool acceleratedCompositingForTransitionEnabled = false; |
135 bool softwareCompositingEnabled = false; | 137 bool softwareCompositingEnabled = false; |
136 bool threadedCompositingEnabled = false; | 138 bool threadedCompositingEnabled = false; |
137 bool forceCompositingMode = false; | 139 bool forceCompositingMode = false; |
138 bool threadedHTMLParser = true; | 140 bool threadedHTMLParser = true; |
139 bool accelerated2DCanvasEnabled = false; | 141 bool accelerated2DCanvasEnabled = false; |
140 bool perTilePaintingEnabled = false; | 142 bool perTilePaintingEnabled = false; |
141 bool deferredImageDecodingEnabled = false; | 143 bool deferredImageDecodingEnabled = false; |
142 bool stressOpt = false; | 144 bool stressOpt = false; |
143 bool stressDeopt = false; | 145 bool stressDeopt = false; |
144 bool hardwareAcceleratedGL = false; | 146 bool hardwareAcceleratedGL = false; |
(...skipping 19 matching lines...) Expand all Loading... |
164 else if (argument == optionCheckLayoutTestSystemDeps) | 166 else if (argument == optionCheckLayoutTestSystemDeps) |
165 return checkLayoutTestSystemDependencies() ? EXIT_SUCCESS : EXIT_FAI
LURE; | 167 return checkLayoutTestSystemDependencies() ? EXIT_SUCCESS : EXIT_FAI
LURE; |
166 else if (argument == optionHardwareAcceleratedGL) | 168 else if (argument == optionHardwareAcceleratedGL) |
167 hardwareAcceleratedGL = true; | 169 hardwareAcceleratedGL = true; |
168 else if (argument == optionEnableAcceleratedCompositingForVideo) | 170 else if (argument == optionEnableAcceleratedCompositingForVideo) |
169 acceleratedCompositingForVideoEnabled = true; | 171 acceleratedCompositingForVideoEnabled = true; |
170 else if (argument == optionEnableAcceleratedFixedPosition) | 172 else if (argument == optionEnableAcceleratedFixedPosition) |
171 acceleratedCompositingForFixedPositionEnabled = true; | 173 acceleratedCompositingForFixedPositionEnabled = true; |
172 else if (argument == optionEnableAcceleratedOverflowScroll) | 174 else if (argument == optionEnableAcceleratedOverflowScroll) |
173 acceleratedCompositingForOverflowScrollEnabled = true; | 175 acceleratedCompositingForOverflowScrollEnabled = true; |
| 176 else if (argument == optionEnableAcceleratedTransition) |
| 177 acceleratedCompositingForTransitionEnabled = true; |
174 else if (argument == optionEnableSoftwareCompositing) | 178 else if (argument == optionEnableSoftwareCompositing) |
175 softwareCompositingEnabled = true; | 179 softwareCompositingEnabled = true; |
176 else if (argument == optionEnableThreadedCompositing) | 180 else if (argument == optionEnableThreadedCompositing) |
177 threadedCompositingEnabled = true; | 181 threadedCompositingEnabled = true; |
178 else if (argument == optionForceCompositingMode) | 182 else if (argument == optionForceCompositingMode) |
179 forceCompositingMode = true; | 183 forceCompositingMode = true; |
180 else if (argument == optionDisableThreadedHTMLParser) | 184 else if (argument == optionDisableThreadedHTMLParser) |
181 threadedHTMLParser = false; | 185 threadedHTMLParser = false; |
182 else if (argument == optionEnableAccelerated2DCanvas) | 186 else if (argument == optionEnableAccelerated2DCanvas) |
183 accelerated2DCanvasEnabled = true; | 187 accelerated2DCanvasEnabled = true; |
(...skipping 28 matching lines...) Expand all Loading... |
212 | 216 |
213 if (startupDialog) | 217 if (startupDialog) |
214 openStartupDialog(); | 218 openStartupDialog(); |
215 | 219 |
216 { // Explicit scope for the TestShell instance. | 220 { // Explicit scope for the TestShell instance. |
217 TestShell shell; | 221 TestShell shell; |
218 shell.setAllowExternalPages(allowExternalPages); | 222 shell.setAllowExternalPages(allowExternalPages); |
219 shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingFor
VideoEnabled); | 223 shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingFor
VideoEnabled); |
220 shell.setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompos
itingForFixedPositionEnabled); | 224 shell.setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompos
itingForFixedPositionEnabled); |
221 shell.setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompo
sitingForOverflowScrollEnabled); | 225 shell.setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompo
sitingForOverflowScrollEnabled); |
| 226 shell.setAcceleratedCompositingForTransitionEnabled(acceleratedCompositi
ngForTransitionEnabled); |
222 shell.setSoftwareCompositingEnabled(softwareCompositingEnabled); | 227 shell.setSoftwareCompositingEnabled(softwareCompositingEnabled); |
223 shell.setThreadedCompositingEnabled(threadedCompositingEnabled); | 228 shell.setThreadedCompositingEnabled(threadedCompositingEnabled); |
224 shell.setForceCompositingMode(forceCompositingMode); | 229 shell.setForceCompositingMode(forceCompositingMode); |
225 shell.setThreadedHTMLParser(threadedHTMLParser); | 230 shell.setThreadedHTMLParser(threadedHTMLParser); |
226 shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled); | 231 shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled); |
227 shell.setPerTilePaintingEnabled(perTilePaintingEnabled); | 232 shell.setPerTilePaintingEnabled(perTilePaintingEnabled); |
228 shell.setDeferredImageDecodingEnabled(deferredImageDecodingEnabled); | 233 shell.setDeferredImageDecodingEnabled(deferredImageDecodingEnabled); |
229 shell.setJavaScriptFlags(javaScriptFlags); | 234 shell.setJavaScriptFlags(javaScriptFlags); |
230 shell.setStressOpt(stressOpt); | 235 shell.setStressOpt(stressOpt); |
231 shell.setStressDeopt(stressDeopt); | 236 shell.setStressDeopt(stressDeopt); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 shell.callJSGC(); | 271 shell.callJSGC(); |
267 | 272 |
268 // When we finish the last test, cleanup the DRTTestRunner. | 273 // When we finish the last test, cleanup the DRTTestRunner. |
269 // It may have references to not-yet-cleaned up windows. By cleaning up | 274 // It may have references to not-yet-cleaned up windows. By cleaning up |
270 // here we help purify reports. | 275 // here we help purify reports. |
271 shell.resetTestController(); | 276 shell.resetTestController(); |
272 } | 277 } |
273 | 278 |
274 return EXIT_SUCCESS; | 279 return EXIT_SUCCESS; |
275 } | 280 } |
OLD | NEW |