Changeset 36519 in webkit
- Timestamp:
- Sep 16, 2008 12:40:15 PM (16 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r36517 r36519 1 2008-09-16 Adam Roben <aroben@apple.com> 2 3 Windows build fix after r36511 4 5 Update for rename of layoutTestController to gLayoutTestController. 6 7 * DumpRenderTree/LayoutTestController.cpp: 8 * DumpRenderTree/win/EditingDelegate.cpp: 9 * DumpRenderTree/win/FrameLoadDelegate.cpp: 10 * DumpRenderTree/win/ResourceLoadDelegate.cpp: 11 * DumpRenderTree/win/UIDelegate.cpp: 12 1 13 2008-09-16 Adam Roben <aroben@apple.com> 2 14 -
trunk/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
r32704 r36519 128 128 } 129 129 130 if (:: layoutTestController->dumpEditingCallbacks() && !done)130 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 131 131 _tprintf(TEXT("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n"), dump(range)); 132 132 … … 145 145 } 146 146 147 if (:: layoutTestController->dumpEditingCallbacks() && !done)147 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 148 148 _tprintf(TEXT("EDITING DELEGATE: shouldEndEditingInDOMRange:%s\n"), dump(range)); 149 149 … … 164 164 }; 165 165 166 if (:: layoutTestController->dumpEditingCallbacks() && !done)166 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 167 167 _tprintf(TEXT("EDITING DELEGATE: shouldInsertNode:%s replacingDOMRange:%s givenAction:%s\n"), dumpPath(node), dump(range), insertactionstring[action]); 168 168 … … 188 188 }; 189 189 190 if (:: layoutTestController->dumpEditingCallbacks() && !done)190 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 191 191 _tprintf(TEXT("EDITING DELEGATE: shouldInsertText:%s replacingDOMRange:%s givenAction:%s\n"), text ? text : TEXT(""), dump(range), insertactionstring[action]); 192 192 … … 205 205 } 206 206 207 if (:: layoutTestController->dumpEditingCallbacks() && !done)207 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 208 208 _tprintf(TEXT("EDITING DELEGATE: shouldDeleteDOMRange:%s\n"), dump(range)); 209 209 … … 234 234 }; 235 235 236 if (:: layoutTestController->dumpEditingCallbacks() && !done)236 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 237 237 _tprintf(TEXT("EDITING DELEGATE: shouldChangeSelectedDOMRange:%s toDOMRange:%s affinity:%s stillSelecting:%s\n"), dump(currentRange), dump(proposedRange), affinitystring[selectionAffinity], boolstring[stillSelecting]); 238 238 … … 252 252 } 253 253 254 if (:: layoutTestController->dumpEditingCallbacks() && !done)254 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 255 255 _tprintf(TEXT("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n"), TEXT("'style description'")/*[[style description] UTF8String]*/, dump(range)); 256 256 … … 270 270 } 271 271 272 if (:: layoutTestController->dumpEditingCallbacks() && !done)272 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 273 273 _tprintf(TEXT("EDITING DELEGATE: shouldChangeTypingStyle:%s toStyle:%s\n"), TEXT("'currentStyle description'"), TEXT("'proposedStyle description'")); 274 274 … … 287 287 } 288 288 289 if (:: layoutTestController->dumpEditingCallbacks() && !done)289 if (::gLayoutTestController->dumpEditingCallbacks() && !done) 290 290 _tprintf(TEXT("EDITING DELEGATE: doPlatformCommand:%s\n"), command ? command : TEXT("")); 291 291 … … 297 297 /* [in] */ IWebNotification* notification) 298 298 { 299 if (:: layoutTestController->dumpEditingCallbacks() && !done) {299 if (::gLayoutTestController->dumpEditingCallbacks() && !done) { 300 300 BSTR name; 301 301 notification->name(&name); … … 309 309 /* [in] */ IWebNotification *notification) 310 310 { 311 if (:: layoutTestController->dumpEditingCallbacks() && !done) {311 if (::gLayoutTestController->dumpEditingCallbacks() && !done) { 312 312 BSTR name; 313 313 notification->name(&name); … … 321 321 /* [in] */ IWebNotification *notification) 322 322 { 323 if (:: layoutTestController->dumpEditingCallbacks() && !done) {323 if (::gLayoutTestController->dumpEditingCallbacks() && !done) { 324 324 BSTR name; 325 325 notification->name(&name); … … 333 333 /* [in] */ IWebNotification *notification) 334 334 { 335 if (:: layoutTestController->dumpEditingCallbacks() && !done) {335 if (::gLayoutTestController->dumpEditingCallbacks() && !done) { 336 336 BSTR name; 337 337 notification->name(&name); … … 345 345 /* [in] */ IWebNotification *notification) 346 346 { 347 if (:: layoutTestController->dumpEditingCallbacks() && !done) {347 if (::gLayoutTestController->dumpEditingCallbacks() && !done) { 348 348 BSTR name; 349 349 notification->name(&name); -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
r35903 r36519 129 129 /* [in] */ IWebFrame* frame) 130 130 { 131 if (!done && layoutTestController->dumpFrameLoadCallbacks())131 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 132 132 printf("%s - didStartProvisionalLoadForFrame\n", 133 133 descriptionSuitableForTestResult(frame).c_str()); … … 146 146 /* [in] */ IWebFrame *frame) 147 147 { 148 if (!done && layoutTestController->dumpFrameLoadCallbacks())148 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 149 149 printf("%s - didFailProvisionalLoadWithError\n", 150 150 descriptionSuitableForTestResult(frame).c_str()); … … 163 163 webViewPrivate->updateFocusedAndActiveState(); 164 164 165 if (!done && layoutTestController->dumpFrameLoadCallbacks())165 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 166 166 printf("%s - didCommitLoadForFrame\n", 167 167 descriptionSuitableForTestResult(frame).c_str()); … … 176 176 /* [in] */ IWebFrame *frame) 177 177 { 178 if (:: layoutTestController->dumpTitleChanges() && !done)178 if (::gLayoutTestController->dumpTitleChanges() && !done) 179 179 printf("TITLE CHANGED: %S\n", title ? title : L""); 180 180 return S_OK; … … 191 191 192 192 // if we didn't start a new load, then we finished all the commands, so we're ready to dump state 193 if (!topLoadingFrame && !:: layoutTestController->waitToDump())193 if (!topLoadingFrame && !::gLayoutTestController->waitToDump()) 194 194 dump(); 195 195 } … … 211 211 WorkQueue::shared()->setFrozen(true); 212 212 213 if (:: layoutTestController->waitToDump())213 if (::gLayoutTestController->waitToDump()) 214 214 return; 215 215 … … 228 228 /* [in] */ IWebFrame* frame) 229 229 { 230 if (!done && layoutTestController->dumpFrameLoadCallbacks())230 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 231 231 printf("%s - didFinishLoadForFrame\n", 232 232 descriptionSuitableForTestResult(frame).c_str()); … … 260 260 JSValueRef exception = 0; 261 261 262 :: layoutTestController->makeWindowObject(context, windowObject, &exception);262 ::gLayoutTestController->makeWindowObject(context, windowObject, &exception); 263 263 ASSERT(!exception); 264 264 … … 281 281 /* [in] */ IWebFrame *frame) 282 282 { 283 if (!done && layoutTestController->dumpFrameLoadCallbacks())283 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 284 284 printf("%s - didFinishDocumentLoadForFrame\n", 285 285 descriptionSuitableForTestResult(frame).c_str()); … … 305 305 /* [in] */ IWebFrame *frame) 306 306 { 307 if (!done && layoutTestController->dumpFrameLoadCallbacks())307 if (!done && gLayoutTestController->dumpFrameLoadCallbacks()) 308 308 printf("%s - didHandleOnloadEventsForFrame\n", 309 309 descriptionSuitableForTestResult(frame).c_str()); -
trunk/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
r28705 r36519 195 195 /* [in] */ unsigned long identifier) 196 196 { 197 if (!done && layoutTestController->dumpResourceLoadCallbacks()) {197 if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) { 198 198 BSTR urlStr; 199 199 if (FAILED(request->URL(&urlStr))) … … 214 214 /* [retval][out] */ IWebURLRequest **newRequest) 215 215 { 216 if (!done && layoutTestController->dumpResourceLoadCallbacks()) {216 if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) { 217 217 printf("%S - willSendRequest %S redirectResponse %S\n", 218 218 descriptionSuitableForTestResult(identifier).c_str(), … … 231 231 /* [in] */ IWebDataSource* dataSource) 232 232 { 233 if (!done && layoutTestController->dumpResourceLoadCallbacks()) {233 if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) { 234 234 printf("%S - didFinishLoading\n", 235 235 descriptionSuitableForTestResult(identifier).c_str()), … … 246 246 /* [in] */ IWebDataSource* dataSource) 247 247 { 248 if (!done && layoutTestController->dumpResourceLoadCallbacks()) {248 if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) { 249 249 printf("%S - didFailLoadingWithError: %S\n", 250 250 descriptionSuitableForTestResult(identifier).c_str(), -
trunk/WebKitTools/DumpRenderTree/win/UIDelegate.cpp
r34023 r36519 386 386 /* [retval][out] */ IWebView **newWebView) 387 387 { 388 if (!:: layoutTestController->canOpenWindows())388 if (!::gLayoutTestController->canOpenWindows()) 389 389 return E_FAIL; 390 390 *newWebView = createWebViewAndOffscreenWindow(); … … 438 438 HRESULT STDMETHODCALLTYPE UIDelegate::setStatusText(IWebView*, BSTR text) 439 439 { 440 if ( layoutTestController->dumpStatusCallbacks())440 if (gLayoutTestController->dumpStatusCallbacks()) 441 441 printf("UI DELEGATE STATUS CALLBACK: setStatusText:%S\n", text ? text : L""); 442 442 return S_OK;
Note: See TracChangeset
for help on using the changeset viewer.