Changeset 36519 in webkit


Ignore:
Timestamp:
Sep 16, 2008 12:40:15 PM (16 years ago)
Author:
Adam Roben
Message:

Windows build fix after r36511

Update for rename of layoutTestController to gLayoutTestController.

  • DumpRenderTree/LayoutTestController.cpp:
  • DumpRenderTree/win/EditingDelegate.cpp:
  • DumpRenderTree/win/FrameLoadDelegate.cpp:
  • DumpRenderTree/win/ResourceLoadDelegate.cpp:
  • DumpRenderTree/win/UIDelegate.cpp:
Location:
trunk/WebKitTools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r36517 r36519  
     12008-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
    1132008-09-16  Adam Roben  <aroben@apple.com>
    214
  • trunk/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp

    r32704 r36519  
    128128    }
    129129
    130     if (::layoutTestController->dumpEditingCallbacks() && !done)
     130    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    131131        _tprintf(TEXT("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n"), dump(range));
    132132
     
    145145    }
    146146
    147     if (::layoutTestController->dumpEditingCallbacks() && !done)
     147    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    148148        _tprintf(TEXT("EDITING DELEGATE: shouldEndEditingInDOMRange:%s\n"), dump(range));
    149149
     
    164164    };
    165165
    166     if (::layoutTestController->dumpEditingCallbacks() && !done)
     166    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    167167        _tprintf(TEXT("EDITING DELEGATE: shouldInsertNode:%s replacingDOMRange:%s givenAction:%s\n"), dumpPath(node), dump(range), insertactionstring[action]);
    168168
     
    188188    };
    189189
    190     if (::layoutTestController->dumpEditingCallbacks() && !done)
     190    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    191191        _tprintf(TEXT("EDITING DELEGATE: shouldInsertText:%s replacingDOMRange:%s givenAction:%s\n"), text ? text : TEXT(""), dump(range), insertactionstring[action]);
    192192
     
    205205    }
    206206
    207     if (::layoutTestController->dumpEditingCallbacks() && !done)
     207    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    208208        _tprintf(TEXT("EDITING DELEGATE: shouldDeleteDOMRange:%s\n"), dump(range));
    209209
     
    234234    };
    235235
    236     if (::layoutTestController->dumpEditingCallbacks() && !done)
     236    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    237237        _tprintf(TEXT("EDITING DELEGATE: shouldChangeSelectedDOMRange:%s toDOMRange:%s affinity:%s stillSelecting:%s\n"), dump(currentRange), dump(proposedRange), affinitystring[selectionAffinity], boolstring[stillSelecting]);
    238238
     
    252252    }
    253253
    254     if (::layoutTestController->dumpEditingCallbacks() && !done)
     254    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    255255        _tprintf(TEXT("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n"), TEXT("'style description'")/*[[style description] UTF8String]*/, dump(range));
    256256
     
    270270    }
    271271
    272     if (::layoutTestController->dumpEditingCallbacks() && !done)
     272    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    273273        _tprintf(TEXT("EDITING DELEGATE: shouldChangeTypingStyle:%s toStyle:%s\n"), TEXT("'currentStyle description'"), TEXT("'proposedStyle description'"));
    274274
     
    287287    }
    288288
    289     if (::layoutTestController->dumpEditingCallbacks() && !done)
     289    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
    290290        _tprintf(TEXT("EDITING DELEGATE: doPlatformCommand:%s\n"), command ? command : TEXT(""));
    291291
     
    297297    /* [in] */ IWebNotification* notification)
    298298{
    299     if (::layoutTestController->dumpEditingCallbacks() && !done) {
     299    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
    300300        BSTR name;
    301301        notification->name(&name);
     
    309309    /* [in] */ IWebNotification *notification)
    310310{
    311     if (::layoutTestController->dumpEditingCallbacks() && !done) {
     311    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
    312312        BSTR name;
    313313        notification->name(&name);
     
    321321    /* [in] */ IWebNotification *notification)
    322322{
    323     if (::layoutTestController->dumpEditingCallbacks() && !done) {
     323    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
    324324        BSTR name;
    325325        notification->name(&name);
     
    333333    /* [in] */ IWebNotification *notification)
    334334{
    335     if (::layoutTestController->dumpEditingCallbacks() && !done) {
     335    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
    336336        BSTR name;
    337337        notification->name(&name);
     
    345345    /* [in] */ IWebNotification *notification)
    346346{
    347     if (::layoutTestController->dumpEditingCallbacks() && !done) {
     347    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
    348348        BSTR name;
    349349        notification->name(&name);
  • trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp

    r35903 r36519  
    129129        /* [in] */ IWebFrame* frame)
    130130{
    131     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     131    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    132132        printf("%s - didStartProvisionalLoadForFrame\n",
    133133                descriptionSuitableForTestResult(frame).c_str());
     
    146146    /* [in] */ IWebFrame *frame)
    147147{
    148     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     148    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    149149        printf("%s - didFailProvisionalLoadWithError\n",
    150150                descriptionSuitableForTestResult(frame).c_str());
     
    163163    webViewPrivate->updateFocusedAndActiveState();
    164164
    165     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     165    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    166166        printf("%s - didCommitLoadForFrame\n",
    167167                descriptionSuitableForTestResult(frame).c_str());
     
    176176        /* [in] */ IWebFrame *frame)
    177177{
    178     if (::layoutTestController->dumpTitleChanges() && !done)
     178    if (::gLayoutTestController->dumpTitleChanges() && !done)
    179179        printf("TITLE CHANGED: %S\n", title ? title : L"");
    180180    return S_OK;
     
    191191
    192192    // 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())
    194194        dump();
    195195}
     
    211211    WorkQueue::shared()->setFrozen(true);
    212212
    213     if (::layoutTestController->waitToDump())
     213    if (::gLayoutTestController->waitToDump())
    214214        return;
    215215
     
    228228        /* [in] */ IWebFrame* frame)
    229229{
    230     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     230    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    231231        printf("%s - didFinishLoadForFrame\n",
    232232                descriptionSuitableForTestResult(frame).c_str());
     
    260260    JSValueRef exception = 0;
    261261
    262     ::layoutTestController->makeWindowObject(context, windowObject, &exception);
     262    ::gLayoutTestController->makeWindowObject(context, windowObject, &exception);
    263263    ASSERT(!exception);
    264264
     
    281281    /* [in] */ IWebFrame *frame)
    282282{
    283     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     283    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    284284        printf("%s - didFinishDocumentLoadForFrame\n",
    285285                descriptionSuitableForTestResult(frame).c_str());
     
    305305    /* [in] */ IWebFrame *frame)
    306306{
    307     if (!done && layoutTestController->dumpFrameLoadCallbacks())
     307    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
    308308        printf("%s - didHandleOnloadEventsForFrame\n",
    309309                descriptionSuitableForTestResult(frame).c_str());
  • trunk/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp

    r28705 r36519  
    195195    /* [in] */ unsigned long identifier)
    196196{
    197     if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
     197    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
    198198        BSTR urlStr;
    199199        if (FAILED(request->URL(&urlStr)))
     
    214214    /* [retval][out] */ IWebURLRequest **newRequest)
    215215{
    216     if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
     216    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
    217217        printf("%S - willSendRequest %S redirectResponse %S\n",
    218218            descriptionSuitableForTestResult(identifier).c_str(),
     
    231231    /* [in] */ IWebDataSource* dataSource)
    232232{
    233     if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
     233    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
    234234        printf("%S - didFinishLoading\n",
    235235            descriptionSuitableForTestResult(identifier).c_str()),
     
    246246    /* [in] */ IWebDataSource* dataSource)
    247247{
    248     if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
     248    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
    249249        printf("%S - didFailLoadingWithError: %S\n",
    250250            descriptionSuitableForTestResult(identifier).c_str(),
  • trunk/WebKitTools/DumpRenderTree/win/UIDelegate.cpp

    r34023 r36519  
    386386        /* [retval][out] */ IWebView **newWebView)
    387387{
    388     if (!::layoutTestController->canOpenWindows())
     388    if (!::gLayoutTestController->canOpenWindows())
    389389        return E_FAIL;
    390390    *newWebView = createWebViewAndOffscreenWindow();
     
    438438HRESULT STDMETHODCALLTYPE UIDelegate::setStatusText(IWebView*, BSTR text)
    439439{
    440     if (layoutTestController->dumpStatusCallbacks())
     440    if (gLayoutTestController->dumpStatusCallbacks())
    441441        printf("UI DELEGATE STATUS CALLBACK: setStatusText:%S\n", text ? text : L"");
    442442    return S_OK;
Note: See TracChangeset for help on using the changeset viewer.