Changeset 84361 in webkit
- Timestamp:
- Apr 20, 2011 6:17:01 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r84333 r84361 1 2011-04-20 W. James MacLean <wjmaclean@chromium.org> 2 3 Reviewed by Kenneth Russell. 4 5 Add support for composite-to-texture to DumpRenderTree. 6 https://bugs.webkit.org/show_bug.cgi?id=58675 7 8 * DumpRenderTree/chromium/DumpRenderTree.cpp: 9 (main): 10 * DumpRenderTree/chromium/TestShell.cpp: 11 (TestShell::TestShell): 12 (TestShell::resetWebSettings): 13 * DumpRenderTree/chromium/TestShell.h: 14 (TestShell::setCompositeToTexture): 15 * DumpRenderTree/chromium/WebPreferences.cpp: 16 (WebPreferences::reset): 17 (WebPreferences::applyTo): 18 * DumpRenderTree/chromium/WebPreferences.h: 19 1 20 2011-04-19 Eric Seidel <eric@webkit.org> 2 21 -
trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
r81603 r84361 57 57 static const char optionForceCompositingMode[] = "--force-compositing-mode"; 58 58 static const char optionEnableAccelerated2DCanvas[] = "--enable-accelerated-2d-canvas"; 59 static const char optionEnableCompositeToTexture[] = "--enable-composite-to-texture"; 59 60 60 61 static const char optionStressOpt[] = "--stress-opt"; … … 134 135 bool startupDialog = false; 135 136 bool acceleratedCompositingEnabled = false; 137 bool compositeToTexture = false; 136 138 bool forceCompositingMode = false; 137 139 bool accelerated2DCanvasEnabled = false; … … 169 171 else if (argument == optionEnableAcceleratedCompositing) 170 172 acceleratedCompositingEnabled = true; 173 else if (argument == optionEnableCompositeToTexture) 174 compositeToTexture = true; 171 175 else if (argument == optionForceCompositingMode) 172 176 forceCompositingMode = true; … … 204 208 shell.setAllowExternalPages(allowExternalPages); 205 209 shell.setAcceleratedCompositingEnabled(acceleratedCompositingEnabled); 210 shell.setCompositeToTexture(compositeToTexture); 206 211 shell.setForceCompositingMode(forceCompositingMode); 207 212 shell.setAccelerated2dCanvasEnabled(accelerated2DCanvasEnabled); -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r83941 r84361 100 100 , m_allowExternalPages(false) 101 101 , m_acceleratedCompositingEnabled(false) 102 , m_compositeToTexture(false) 102 103 , m_forceCompositingMode(false) 103 104 , m_accelerated2dCanvasEnabled(false) … … 179 180 m_prefs.reset(); 180 181 m_prefs.acceleratedCompositingEnabled = m_acceleratedCompositingEnabled; 182 m_prefs.compositeToTexture = m_compositeToTexture; 181 183 m_prefs.forceCompositingMode = m_forceCompositingMode; 182 184 m_prefs.accelerated2dCanvasEnabled = m_accelerated2dCanvasEnabled; -
trunk/Tools/DumpRenderTree/chromium/TestShell.h
r83941 r84361 127 127 128 128 void setAcceleratedCompositingEnabled(bool enabled) { m_acceleratedCompositingEnabled = enabled; } 129 void setCompositeToTexture(bool enabled) { m_compositeToTexture = enabled; } 129 130 void setForceCompositingMode(bool enabled) { m_forceCompositingMode = enabled; } 130 131 void setAccelerated2dCanvasEnabled(bool enabled) { m_accelerated2dCanvasEnabled = enabled; } … … 203 204 bool m_allowExternalPages; 204 205 bool m_acceleratedCompositingEnabled; 206 bool m_compositeToTexture; 205 207 bool m_forceCompositingMode; 206 208 bool m_accelerated2dCanvasEnabled; -
trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp
r83701 r84361 104 104 hyperlinkAuditingEnabled = false; 105 105 acceleratedCompositingEnabled = false; 106 compositeToTexture = false; 106 107 accelerated2dCanvasEnabled = false; 107 108 forceCompositingMode = false; … … 151 152 settings->setCaretBrowsingEnabled(caretBrowsingEnabled); 152 153 settings->setAcceleratedCompositingEnabled(acceleratedCompositingEnabled); 154 settings->setCompositeToTextureEnabled(compositeToTexture); 153 155 settings->setForceCompositingMode(forceCompositingMode); 154 156 settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled); -
trunk/Tools/DumpRenderTree/chromium/WebPreferences.h
r81289 r84361 79 79 bool caretBrowsingEnabled; 80 80 bool acceleratedCompositingEnabled; 81 bool compositeToTexture; 81 82 bool forceCompositingMode; 82 83 bool accelerated2dCanvasEnabled;
Note: See TracChangeset
for help on using the changeset viewer.