Windows build fix after r36511
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Sep 2008 19:40:15 +0000 (19:40 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Sep 2008 19:40:15 +0000 (19:40 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@36519 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
WebKitTools/DumpRenderTree/win/UIDelegate.cpp

index 9b04b4e..201ed71 100644 (file)
@@ -1,5 +1,17 @@
 2008-09-16  Adam Roben  <aroben@apple.com>
 
+        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:
+
+2008-09-16  Adam Roben  <aroben@apple.com>
+
         Add a script to print out the dependency tree of a Visual Studio
         solution file
 
index 7add64e..d814729 100644 (file)
@@ -127,7 +127,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldBeginEditingInDOMRange(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n"), dump(range));
 
     *result = m_acceptsEditing;
@@ -144,7 +144,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldEndEditingInDOMRange(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldEndEditingInDOMRange:%s\n"), dump(range));
 
     *result = m_acceptsEditing;
@@ -163,7 +163,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldInsertNode(
         TEXT("WebViewInsertActionDropped"),
     };
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldInsertNode:%s replacingDOMRange:%s givenAction:%s\n"), dumpPath(node), dump(range), insertactionstring[action]);
 
     return S_OK;
@@ -187,7 +187,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldInsertText(
         TEXT("WebViewInsertActionDropped"),
     };
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldInsertText:%s replacingDOMRange:%s givenAction:%s\n"), text ? text : TEXT(""), dump(range), insertactionstring[action]);
 
     *result = m_acceptsEditing;
@@ -204,7 +204,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldDeleteDOMRange(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldDeleteDOMRange:%s\n"), dump(range));
 
     *result = m_acceptsEditing;
@@ -233,7 +233,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldChangeSelectedDOMRange(
         TEXT("TRUE")
     };
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldChangeSelectedDOMRange:%s toDOMRange:%s affinity:%s stillSelecting:%s\n"), dump(currentRange), dump(proposedRange), affinitystring[selectionAffinity], boolstring[stillSelecting]);
 
     *result = m_acceptsEditing;
@@ -251,7 +251,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldApplyStyle(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n"), TEXT("'style description'")/*[[style description] UTF8String]*/, dump(range));
 
     *result = m_acceptsEditing;
@@ -269,7 +269,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::shouldChangeTypingStyle(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: shouldChangeTypingStyle:%s toStyle:%s\n"), TEXT("'currentStyle description'"), TEXT("'proposedStyle description'"));
 
     *result = m_acceptsEditing;
@@ -286,7 +286,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::doPlatformCommand(
         return E_POINTER;
     }
 
-    if (::layoutTestController->dumpEditingCallbacks() && !done)
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done)
         _tprintf(TEXT("EDITING DELEGATE: doPlatformCommand:%s\n"), command ? command : TEXT(""));
 
     *result = m_acceptsEditing;
@@ -296,7 +296,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::doPlatformCommand(
 HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidBeginEditing( 
     /* [in] */ IWebNotification* notification)
 {
-    if (::layoutTestController->dumpEditingCallbacks() && !done) {
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
         BSTR name;
         notification->name(&name);
         _tprintf(TEXT("EDITING DELEGATE: webViewDidBeginEditing:%s\n"), name ? name : TEXT(""));
@@ -308,7 +308,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidBeginEditing(
 HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidChange( 
     /* [in] */ IWebNotification *notification)
 {
-    if (::layoutTestController->dumpEditingCallbacks() && !done) {
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
         BSTR name;
         notification->name(&name);
         _tprintf(TEXT("EDITING DELEGATE: webViewDidBeginEditing:%s\n"), name ? name : TEXT(""));
@@ -320,7 +320,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidChange(
 HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidEndEditing( 
     /* [in] */ IWebNotification *notification)
 {
-    if (::layoutTestController->dumpEditingCallbacks() && !done) {
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
         BSTR name;
         notification->name(&name);
         _tprintf(TEXT("EDITING DELEGATE: webViewDidEndEditing:%s\n"), name ? name : TEXT(""));
@@ -332,7 +332,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidEndEditing(
 HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidChangeTypingStyle( 
     /* [in] */ IWebNotification *notification)
 {
-    if (::layoutTestController->dumpEditingCallbacks() && !done) {
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
         BSTR name;
         notification->name(&name);
         _tprintf(TEXT("EDITING DELEGATE: webViewDidChangeTypingStyle:%s\n"), name ? name : TEXT(""));
@@ -344,7 +344,7 @@ HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidChangeTypingStyle(
 HRESULT STDMETHODCALLTYPE EditingDelegate::webViewDidChangeSelection( 
     /* [in] */ IWebNotification *notification)
 {
-    if (::layoutTestController->dumpEditingCallbacks() && !done) {
+    if (::gLayoutTestController->dumpEditingCallbacks() && !done) {
         BSTR name;
         notification->name(&name);
         _tprintf(TEXT("EDITING DELEGATE: webViewDidChangeSelection:%s\n"), name ? name : TEXT(""));
index e2127d7..1fc9f91 100644 (file)
@@ -128,7 +128,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didStartProvisionalLoadForFrame(
         /* [in] */ IWebView* webView,
         /* [in] */ IWebFrame* frame) 
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didStartProvisionalLoadForFrame\n",
                 descriptionSuitableForTestResult(frame).c_str());
 
@@ -145,7 +145,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didFailProvisionalLoadWithError(
     /* [in] */ IWebError *error,
     /* [in] */ IWebFrame *frame)
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didFailProvisionalLoadWithError\n",
                 descriptionSuitableForTestResult(frame).c_str());
 
@@ -162,7 +162,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didCommitLoadForFrame(
         return hr;
     webViewPrivate->updateFocusedAndActiveState();
 
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didCommitLoadForFrame\n",
                 descriptionSuitableForTestResult(frame).c_str());
 
@@ -175,7 +175,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didReceiveTitle(
         /* [in] */ BSTR title,
         /* [in] */ IWebFrame *frame)
 {
-    if (::layoutTestController->dumpTitleChanges() && !done)
+    if (::gLayoutTestController->dumpTitleChanges() && !done)
         printf("TITLE CHANGED: %S\n", title ? title : L"");
     return S_OK;
 }
@@ -190,7 +190,7 @@ void FrameLoadDelegate::processWork()
     }
 
     // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
-    if (!topLoadingFrame && !::layoutTestController->waitToDump())
+    if (!topLoadingFrame && !::gLayoutTestController->waitToDump())
         dump();
 }
 
@@ -210,7 +210,7 @@ void FrameLoadDelegate::locationChangeDone(IWebError*, IWebFrame* frame)
     topLoadingFrame = 0;
     WorkQueue::shared()->setFrozen(true);
 
-    if (::layoutTestController->waitToDump())
+    if (::gLayoutTestController->waitToDump())
         return;
 
     if (WorkQueue::shared()->count()) {
@@ -227,7 +227,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didFinishLoadForFrame(
         /* [in] */ IWebView* webView,
         /* [in] */ IWebFrame* frame)
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didFinishLoadForFrame\n",
                 descriptionSuitableForTestResult(frame).c_str());
 
@@ -259,7 +259,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didClearWindowObject(
 {
     JSValueRef exception = 0;
 
-    ::layoutTestController->makeWindowObject(context, windowObject, &exception);
+    ::gLayoutTestController->makeWindowObject(context, windowObject, &exception);
     ASSERT(!exception);
 
     m_gcController->makeWindowObject(context, windowObject, &exception);
@@ -280,7 +280,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didFinishDocumentLoadForFrame(
     /* [in] */ IWebView *sender,
     /* [in] */ IWebFrame *frame)
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didFinishDocumentLoadForFrame\n",
                 descriptionSuitableForTestResult(frame).c_str());
     if (!done) {
@@ -304,7 +304,7 @@ HRESULT STDMETHODCALLTYPE FrameLoadDelegate::didHandleOnloadEventsForFrame(
     /* [in] */ IWebView *sender,
     /* [in] */ IWebFrame *frame)
 {
-    if (!done && layoutTestController->dumpFrameLoadCallbacks())
+    if (!done && gLayoutTestController->dumpFrameLoadCallbacks())
         printf("%s - didHandleOnloadEventsForFrame\n",
                 descriptionSuitableForTestResult(frame).c_str());
 
index 0f15648..c82e9ee 100644 (file)
@@ -194,7 +194,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::identifierForInitialRequest(
     /* [in] */ IWebDataSource* dataSource,
     /* [in] */ unsigned long identifier)
 { 
-    if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
         BSTR urlStr;
         if (FAILED(request->URL(&urlStr)))
             return E_FAIL;
@@ -213,7 +213,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::willSendRequest(
     /* [in] */ IWebDataSource* dataSource,
     /* [retval][out] */ IWebURLRequest **newRequest)
 {
-    if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
         printf("%S - willSendRequest %S redirectResponse %S\n", 
             descriptionSuitableForTestResult(identifier).c_str(),
             descriptionSuitableForTestResult(request).c_str(),
@@ -230,7 +230,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didFinishLoadingFromDataSource(
     /* [in] */ unsigned long identifier,
     /* [in] */ IWebDataSource* dataSource)
 {
-    if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
         printf("%S - didFinishLoading\n",
             descriptionSuitableForTestResult(identifier).c_str()),
        urlMap().remove(identifier);
@@ -245,7 +245,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didFailLoadingWithError(
     /* [in] */ IWebError* error,
     /* [in] */ IWebDataSource* dataSource)
 {
-    if (!done && layoutTestController->dumpResourceLoadCallbacks()) {
+    if (!done && gLayoutTestController->dumpResourceLoadCallbacks()) {
         printf("%S - didFailLoadingWithError: %S\n", 
             descriptionSuitableForTestResult(identifier).c_str(),
             descriptionSuitableForTestResult(error, identifier).c_str());
index b2e6e3a..5be9551 100755 (executable)
@@ -385,7 +385,7 @@ HRESULT STDMETHODCALLTYPE UIDelegate::createWebViewWithRequest(
         /* [in] */ IWebURLRequest *request,
         /* [retval][out] */ IWebView **newWebView)
 {
-    if (!::layoutTestController->canOpenWindows())
+    if (!::gLayoutTestController->canOpenWindows())
         return E_FAIL;
     *newWebView = createWebViewAndOffscreenWindow();
     return S_OK;
@@ -437,7 +437,7 @@ HRESULT STDMETHODCALLTYPE UIDelegate::exceededDatabaseQuota(
 
 HRESULT STDMETHODCALLTYPE UIDelegate::setStatusText(IWebView*, BSTR text)
 { 
-    if (layoutTestController->dumpStatusCallbacks())
+    if (gLayoutTestController->dumpStatusCallbacks())
         printf("UI DELEGATE STATUS CALLBACK: setStatusText:%S\n", text ? text : L"");
     return S_OK;
 }