| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 TestShell::TestShell() | 103 TestShell::TestShell() |
| 104 : m_testIsPending(false) | 104 : m_testIsPending(false) |
| 105 , m_testIsPreparing(false) | 105 , m_testIsPreparing(false) |
| 106 , m_focusedWidget(0) | 106 , m_focusedWidget(0) |
| 107 , m_devTools(0) | 107 , m_devTools(0) |
| 108 , m_dumpPixelsForCurrentTest(false) | 108 , m_dumpPixelsForCurrentTest(false) |
| 109 , m_allowExternalPages(false) | 109 , m_allowExternalPages(false) |
| 110 , m_acceleratedCompositingForVideoEnabled(false) | 110 , m_acceleratedCompositingForVideoEnabled(false) |
| 111 , m_acceleratedCompositingForFixedPositionEnabled(false) | 111 , m_acceleratedCompositingForFixedPositionEnabled(false) |
| 112 , m_acceleratedCompositingForOverflowScrollEnabled(false) | 112 , m_acceleratedCompositingForOverflowScrollEnabled(false) |
| 113 , m_acceleratedCompositingForFixedRootBackgroundEnabled(false) |
| 113 , m_softwareCompositingEnabled(false) | 114 , m_softwareCompositingEnabled(false) |
| 114 , m_threadedCompositingEnabled(false) | 115 , m_threadedCompositingEnabled(false) |
| 115 , m_forceCompositingMode(false) | 116 , m_forceCompositingMode(false) |
| 116 , m_threadedHTMLParser(true) | 117 , m_threadedHTMLParser(true) |
| 117 , m_accelerated2dCanvasEnabled(false) | 118 , m_accelerated2dCanvasEnabled(false) |
| 118 , m_perTilePaintingEnabled(false) | 119 , m_perTilePaintingEnabled(false) |
| 119 , m_deferredImageDecodingEnabled(false) | 120 , m_deferredImageDecodingEnabled(false) |
| 120 , m_stressOpt(false) | 121 , m_stressOpt(false) |
| 121 , m_stressDeopt(false) | 122 , m_stressDeopt(false) |
| 122 , m_dumpWhenFinished(true) | 123 , m_dumpWhenFinished(true) |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 } | 211 } |
| 211 } | 212 } |
| 212 | 213 |
| 213 void TestShell::resetWebSettings(WebView& webView) | 214 void TestShell::resetWebSettings(WebView& webView) |
| 214 { | 215 { |
| 215 m_prefs.reset(); | 216 m_prefs.reset(); |
| 216 m_prefs.acceleratedCompositingEnabled = true; | 217 m_prefs.acceleratedCompositingEnabled = true; |
| 217 m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForV
ideoEnabled; | 218 m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForV
ideoEnabled; |
| 218 m_prefs.acceleratedCompositingForFixedPositionEnabled = m_acceleratedComposi
tingForFixedPositionEnabled; | 219 m_prefs.acceleratedCompositingForFixedPositionEnabled = m_acceleratedComposi
tingForFixedPositionEnabled; |
| 219 m_prefs.acceleratedCompositingForOverflowScrollEnabled = m_acceleratedCompos
itingForOverflowScrollEnabled; | 220 m_prefs.acceleratedCompositingForOverflowScrollEnabled = m_acceleratedCompos
itingForOverflowScrollEnabled; |
| 221 m_prefs.acceleratedCompositingForFixedRootBackgroundEnabled = m_acceleratedC
ompositingForFixedRootBackgroundEnabled; |
| 220 m_prefs.forceCompositingMode = m_forceCompositingMode; | 222 m_prefs.forceCompositingMode = m_forceCompositingMode; |
| 221 m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled; | 223 m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled; |
| 222 m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled; | 224 m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled; |
| 223 m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled; | 225 m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled; |
| 224 m_prefs.threadedHTMLParser = m_threadedHTMLParser; | 226 m_prefs.threadedHTMLParser = m_threadedHTMLParser; |
| 225 m_prefs.applyTo(&webView); | 227 m_prefs.applyTo(&webView); |
| 226 } | 228 } |
| 227 | 229 |
| 228 void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels) | 230 void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels) |
| 229 { | 231 { |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 for (size_t index = 0; index < entryCount; ++index) { | 560 for (size_t index = 0; index < entryCount; ++index) { |
| 559 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c
ontentState(); | 561 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c
ontentState(); |
| 560 if (historyItem.isNull()) { | 562 if (historyItem.isNull()) { |
| 561 historyItem.initialize(); | 563 historyItem.initialize(); |
| 562 historyItem.setURLString(navigationController.entryAtIndex(index)->U
RL().spec().utf16()); | 564 historyItem.setURLString(navigationController.entryAtIndex(index)->U
RL().spec().utf16()); |
| 563 } | 565 } |
| 564 result[index] = historyItem; | 566 result[index] = historyItem; |
| 565 } | 567 } |
| 566 history->swap(result); | 568 history->swap(result); |
| 567 } | 569 } |
| OLD | NEW |