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 : m_testIsPending(false) | 103 : m_testIsPending(false) |
104 , m_testIsPreparing(false) | 104 , m_testIsPreparing(false) |
105 , m_focusedWidget(0) | 105 , m_focusedWidget(0) |
106 , m_devTools(0) | 106 , m_devTools(0) |
107 , m_dumpPixelsForCurrentTest(false) | 107 , m_dumpPixelsForCurrentTest(false) |
108 , m_allowExternalPages(false) | 108 , m_allowExternalPages(false) |
109 , m_acceleratedCompositingForVideoEnabled(false) | 109 , m_acceleratedCompositingForVideoEnabled(false) |
110 , m_acceleratedCompositingForFixedPositionEnabled(false) | 110 , m_acceleratedCompositingForFixedPositionEnabled(false) |
111 , m_acceleratedCompositingForOverflowScrollEnabled(false) | 111 , m_acceleratedCompositingForOverflowScrollEnabled(false) |
112 , m_acceleratedCompositingForTransitionEnabled(false) | 112 , m_acceleratedCompositingForTransitionEnabled(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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 } | 207 } |
207 | 208 |
208 void TestShell::resetWebSettings(WebView& webView) | 209 void TestShell::resetWebSettings(WebView& webView) |
209 { | 210 { |
210 m_prefs.reset(); | 211 m_prefs.reset(); |
211 m_prefs.acceleratedCompositingEnabled = true; | 212 m_prefs.acceleratedCompositingEnabled = true; |
212 m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForV
ideoEnabled; | 213 m_prefs.acceleratedCompositingForVideoEnabled = m_acceleratedCompositingForV
ideoEnabled; |
213 m_prefs.acceleratedCompositingForFixedPositionEnabled = m_acceleratedComposi
tingForFixedPositionEnabled; | 214 m_prefs.acceleratedCompositingForFixedPositionEnabled = m_acceleratedComposi
tingForFixedPositionEnabled; |
214 m_prefs.acceleratedCompositingForOverflowScrollEnabled = m_acceleratedCompos
itingForOverflowScrollEnabled; | 215 m_prefs.acceleratedCompositingForOverflowScrollEnabled = m_acceleratedCompos
itingForOverflowScrollEnabled; |
215 m_prefs.acceleratedCompositingForTransitionEnabled = m_acceleratedCompositin
gForTransitionEnabled; | 216 m_prefs.acceleratedCompositingForTransitionEnabled = m_acceleratedCompositin
gForTransitionEnabled; |
| 217 m_prefs.acceleratedCompositingForFixedRootBackgroundEnabled = m_acceleratedC
ompositingForFixedRootBackgroundEnabled; |
216 m_prefs.forceCompositingMode = m_forceCompositingMode; | 218 m_prefs.forceCompositingMode = m_forceCompositingMode; |
217 m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled; | 219 m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled; |
218 m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled; | 220 m_prefs.perTilePaintingEnabled = m_perTilePaintingEnabled; |
219 m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled; | 221 m_prefs.deferredImageDecodingEnabled = m_deferredImageDecodingEnabled; |
220 m_prefs.threadedHTMLParser = m_threadedHTMLParser; | 222 m_prefs.threadedHTMLParser = m_threadedHTMLParser; |
221 m_prefs.applyTo(&webView); | 223 m_prefs.applyTo(&webView); |
222 } | 224 } |
223 | 225 |
224 void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels) | 226 void TestShell::runFileTest(const TestParams& params, bool shouldDumpPixels) |
225 { | 227 { |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 for (size_t index = 0; index < entryCount; ++index) { | 556 for (size_t index = 0; index < entryCount; ++index) { |
555 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c
ontentState(); | 557 WebHistoryItem historyItem = navigationController.entryAtIndex(index)->c
ontentState(); |
556 if (historyItem.isNull()) { | 558 if (historyItem.isNull()) { |
557 historyItem.initialize(); | 559 historyItem.initialize(); |
558 historyItem.setURLString(navigationController.entryAtIndex(index)->U
RL().spec().utf16()); | 560 historyItem.setURLString(navigationController.entryAtIndex(index)->U
RL().spec().utf16()); |
559 } | 561 } |
560 result[index] = historyItem; | 562 result[index] = historyItem; |
561 } | 563 } |
562 history->swap(result); | 564 history->swap(result); |
563 } | 565 } |
OLD | NEW |