| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 optionEnableAcceleratedTransition[] = "--enable-accelerated-tr
ansition"; |
| 66 static const char optionEnableAcceleratedFixedRootBackground[] = "--enable-accel
erated-fixed-root-background"; |
| 66 static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting"; | 67 static const char optionEnablePerTilePainting[] = "--enable-per-tile-painting"; |
| 67 static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image
-decoding"; | 68 static const char optionEnableDeferredImageDecoding[] = "--enable-deferred-image
-decoding"; |
| 68 static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-p
arser"; | 69 static const char optionDisableThreadedHTMLParser[] = "--disable-threaded-html-p
arser"; |
| 69 | 70 |
| 70 static const char optionStressOpt[] = "--stress-opt"; | 71 static const char optionStressOpt[] = "--stress-opt"; |
| 71 static const char optionStressDeopt[] = "--stress-deopt"; | 72 static const char optionStressDeopt[] = "--stress-deopt"; |
| 72 static const char optionJavaScriptFlags[] = "--js-flags="; | 73 static const char optionJavaScriptFlags[] = "--js-flags="; |
| 73 static const char optionEncodeBinary[] = "--encode-binary"; | 74 static const char optionEncodeBinary[] = "--encode-binary"; |
| 74 static const char optionNoTimeout[] = "--no-timeout"; | 75 static const char optionNoTimeout[] = "--no-timeout"; |
| 75 static const char optionWebCoreLogChannels[] = "--webcore-log-channels="; | 76 static const char optionWebCoreLogChannels[] = "--webcore-log-channels="; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 TestParams params; | 128 TestParams params; |
| 128 Vector<string> tests; | 129 Vector<string> tests; |
| 129 bool serverMode = false; | 130 bool serverMode = false; |
| 130 bool dumpAllPixels = false; | 131 bool dumpAllPixels = false; |
| 131 bool allowExternalPages = false; | 132 bool allowExternalPages = false; |
| 132 bool startupDialog = false; | 133 bool startupDialog = false; |
| 133 bool acceleratedCompositingForVideoEnabled = false; | 134 bool acceleratedCompositingForVideoEnabled = false; |
| 134 bool acceleratedCompositingForFixedPositionEnabled = false; | 135 bool acceleratedCompositingForFixedPositionEnabled = false; |
| 135 bool acceleratedCompositingForOverflowScrollEnabled = false; | 136 bool acceleratedCompositingForOverflowScrollEnabled = false; |
| 136 bool acceleratedCompositingForTransitionEnabled = false; | 137 bool acceleratedCompositingForTransitionEnabled = false; |
| 138 bool acceleratedCompositingForFixedRootBackgroundEnabled = false; |
| 137 bool softwareCompositingEnabled = false; | 139 bool softwareCompositingEnabled = false; |
| 138 bool threadedCompositingEnabled = false; | 140 bool threadedCompositingEnabled = false; |
| 139 bool forceCompositingMode = false; | 141 bool forceCompositingMode = false; |
| 140 bool threadedHTMLParser = true; | 142 bool threadedHTMLParser = true; |
| 141 bool accelerated2DCanvasEnabled = false; | 143 bool accelerated2DCanvasEnabled = false; |
| 142 bool perTilePaintingEnabled = false; | 144 bool perTilePaintingEnabled = false; |
| 143 bool deferredImageDecodingEnabled = false; | 145 bool deferredImageDecodingEnabled = false; |
| 144 bool stressOpt = false; | 146 bool stressOpt = false; |
| 145 bool stressDeopt = false; | 147 bool stressDeopt = false; |
| 146 bool hardwareAcceleratedGL = false; | 148 bool hardwareAcceleratedGL = false; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 168 else if (argument == optionHardwareAcceleratedGL) | 170 else if (argument == optionHardwareAcceleratedGL) |
| 169 hardwareAcceleratedGL = true; | 171 hardwareAcceleratedGL = true; |
| 170 else if (argument == optionEnableAcceleratedCompositingForVideo) | 172 else if (argument == optionEnableAcceleratedCompositingForVideo) |
| 171 acceleratedCompositingForVideoEnabled = true; | 173 acceleratedCompositingForVideoEnabled = true; |
| 172 else if (argument == optionEnableAcceleratedFixedPosition) | 174 else if (argument == optionEnableAcceleratedFixedPosition) |
| 173 acceleratedCompositingForFixedPositionEnabled = true; | 175 acceleratedCompositingForFixedPositionEnabled = true; |
| 174 else if (argument == optionEnableAcceleratedOverflowScroll) | 176 else if (argument == optionEnableAcceleratedOverflowScroll) |
| 175 acceleratedCompositingForOverflowScrollEnabled = true; | 177 acceleratedCompositingForOverflowScrollEnabled = true; |
| 176 else if (argument == optionEnableAcceleratedTransition) | 178 else if (argument == optionEnableAcceleratedTransition) |
| 177 acceleratedCompositingForTransitionEnabled = true; | 179 acceleratedCompositingForTransitionEnabled = true; |
| 180 else if (argument == optionEnableAcceleratedFixedRootBackground) |
| 181 acceleratedCompositingForFixedRootBackgroundEnabled = true; |
| 178 else if (argument == optionEnableSoftwareCompositing) | 182 else if (argument == optionEnableSoftwareCompositing) |
| 179 softwareCompositingEnabled = true; | 183 softwareCompositingEnabled = true; |
| 180 else if (argument == optionEnableThreadedCompositing) | 184 else if (argument == optionEnableThreadedCompositing) |
| 181 threadedCompositingEnabled = true; | 185 threadedCompositingEnabled = true; |
| 182 else if (argument == optionForceCompositingMode) | 186 else if (argument == optionForceCompositingMode) |
| 183 forceCompositingMode = true; | 187 forceCompositingMode = true; |
| 184 else if (argument == optionDisableThreadedHTMLParser) | 188 else if (argument == optionDisableThreadedHTMLParser) |
| 185 threadedHTMLParser = false; | 189 threadedHTMLParser = false; |
| 186 else if (argument == optionEnableAccelerated2DCanvas) | 190 else if (argument == optionEnableAccelerated2DCanvas) |
| 187 accelerated2DCanvasEnabled = true; | 191 accelerated2DCanvasEnabled = true; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 217 if (startupDialog) | 221 if (startupDialog) |
| 218 openStartupDialog(); | 222 openStartupDialog(); |
| 219 | 223 |
| 220 { // Explicit scope for the TestShell instance. | 224 { // Explicit scope for the TestShell instance. |
| 221 TestShell shell; | 225 TestShell shell; |
| 222 shell.setAllowExternalPages(allowExternalPages); | 226 shell.setAllowExternalPages(allowExternalPages); |
| 223 shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingFor
VideoEnabled); | 227 shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingFor
VideoEnabled); |
| 224 shell.setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompos
itingForFixedPositionEnabled); | 228 shell.setAcceleratedCompositingForFixedPositionEnabled(acceleratedCompos
itingForFixedPositionEnabled); |
| 225 shell.setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompo
sitingForOverflowScrollEnabled); | 229 shell.setAcceleratedCompositingForOverflowScrollEnabled(acceleratedCompo
sitingForOverflowScrollEnabled); |
| 226 shell.setAcceleratedCompositingForTransitionEnabled(acceleratedCompositi
ngForTransitionEnabled); | 230 shell.setAcceleratedCompositingForTransitionEnabled(acceleratedCompositi
ngForTransitionEnabled); |
| 231 shell.setAcceleratedCompositingForFixedRootBackgroundEnabled(accelerated
CompositingForFixedRootBackgroundEnabled); |
| 227 shell.setSoftwareCompositingEnabled(softwareCompositingEnabled); | 232 shell.setSoftwareCompositingEnabled(softwareCompositingEnabled); |
| 228 shell.setThreadedCompositingEnabled(threadedCompositingEnabled); | 233 shell.setThreadedCompositingEnabled(threadedCompositingEnabled); |
| 229 shell.setForceCompositingMode(forceCompositingMode); | 234 shell.setForceCompositingMode(forceCompositingMode); |
| 230 shell.setThreadedHTMLParser(threadedHTMLParser); | 235 shell.setThreadedHTMLParser(threadedHTMLParser); |
| 231 shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled); | 236 shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled); |
| 232 shell.setPerTilePaintingEnabled(perTilePaintingEnabled); | 237 shell.setPerTilePaintingEnabled(perTilePaintingEnabled); |
| 233 shell.setDeferredImageDecodingEnabled(deferredImageDecodingEnabled); | 238 shell.setDeferredImageDecodingEnabled(deferredImageDecodingEnabled); |
| 234 shell.setJavaScriptFlags(javaScriptFlags); | 239 shell.setJavaScriptFlags(javaScriptFlags); |
| 235 shell.setStressOpt(stressOpt); | 240 shell.setStressOpt(stressOpt); |
| 236 shell.setStressDeopt(stressDeopt); | 241 shell.setStressDeopt(stressDeopt); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 shell.callJSGC(); | 276 shell.callJSGC(); |
| 272 | 277 |
| 273 // When we finish the last test, cleanup the DRTTestRunner. | 278 // When we finish the last test, cleanup the DRTTestRunner. |
| 274 // It may have references to not-yet-cleaned up windows. By cleaning up | 279 // It may have references to not-yet-cleaned up windows. By cleaning up |
| 275 // here we help purify reports. | 280 // here we help purify reports. |
| 276 shell.resetTestController(); | 281 shell.resetTestController(); |
| 277 } | 282 } |
| 278 | 283 |
| 279 return EXIT_SUCCESS; | 284 return EXIT_SUCCESS; |
| 280 } | 285 } |
| OLD | NEW |