Changeset 112354 in webkit
- Timestamp:
- Mar 27, 2012 7:06:54 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r112337 r112354 1 2012-03-27 Adrienne Walker <enne@google.com> 2 3 [chromium] Fix --enabled-threaded-compositing flag in DRT 4 https://bugs.webkit.org/show_bug.cgi?id=82405 5 6 Reviewed by James Robinson. 7 8 --enable-threaded-compositing wasn't working because there was no way 9 to set the value before it was used in the TestShell constructor. 10 11 To avoid adding yet another boolean parameter to TestShell's 12 constructor, add an explicit initialize function that can operate on 13 any boolean settings that are set post-constructor. 14 15 * DumpRenderTree/chromium/DumpRenderTree.cpp: 16 (main): 17 * DumpRenderTree/chromium/TestShell.cpp: 18 (TestShell::TestShell): 19 (TestShell::initialize): 20 * DumpRenderTree/chromium/TestShell.h: 21 (TestShell): 22 (TestShell::setTestShellMode): 23 1 24 2012-03-27 Dirk Pranke <dpranke@chromium.org> 2 25 -
trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp
r111220 r112354 235 235 236 236 { // Explicit scope for the TestShell instance. 237 TestShell shell(testShellMode); 237 TestShell shell; 238 shell.setTestShellMode(testShellMode); 238 239 shell.setAllowExternalPages(allowExternalPages); 239 240 shell.setAcceleratedCompositingForVideoEnabled(acceleratedCompositingForVideoEnabled); … … 252 253 shell.setLayoutTestTimeout(0x20000000); 253 254 } 255 shell.initialize(); 254 256 if (serverMode && !tests.size()) { 255 257 #if OS(ANDROID) -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r111220 r112354 99 99 } 100 100 101 TestShell::TestShell( bool testShellMode)101 TestShell::TestShell() 102 102 : m_testIsPending(false) 103 103 , m_testIsPreparing(false) 104 104 , m_focusedWidget(0) 105 , m_testShellMode( testShellMode)105 , m_testShellMode(false) 106 106 , m_devTools(0) 107 107 , m_allowExternalPages(false) … … 132 132 WebRuntimeFeatures::enableStyleScoped(true); 133 133 WebRuntimeFeatures::enableScriptedSpeech(true); 134 134 } 135 136 void TestShell::initialize() 137 { 135 138 m_webPermissions = adoptPtr(new WebPermissions(this)); 136 139 m_accessibilityController = adoptPtr(new AccessibilityController(this)); … … 151 154 } else 152 155 WebCompositor::initialize(0); 153 154 156 155 157 // 30 second is the same as the value in Mac DRT. -
trunk/Tools/DumpRenderTree/chromium/TestShell.h
r110032 r112354 83 83 class TestShell { 84 84 public: 85 TestShell( bool testShellMode);85 TestShell(); 86 86 ~TestShell(); 87 88 void initialize(); 87 89 88 90 // The main WebView. … … 131 133 void setAllowExternalPages(bool allowExternalPages) { m_allowExternalPages = allowExternalPages; } 132 134 135 void setTestShellMode(bool testShellMode) { m_testShellMode = testShellMode; } 133 136 void setAcceleratedCompositingForVideoEnabled(bool enabled) { m_acceleratedCompositingForVideoEnabled = enabled; } 134 137 void setThreadedCompositingEnabled(bool enabled) { m_threadedCompositingEnabled = enabled; }
Note: See TracChangeset
for help on using the changeset viewer.