Code drop from //branches/cupcake/...@124589

1 files changed, 16 insertions, 15 deletions

diff --git a/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp b/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
index 7add64e..32c02bd 100644
--- a/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/EditingDelegate.cpp
@@ -26,9 +26,10 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "DumpRenderTree.h"
+#include "config.h"
 #include "EditingDelegate.h"
 
+#include "DumpRenderTree.h"
 #include "LayoutTestController.h"
 #include <WebCore/COMPtr.h>
 #include <wtf/Platform.h>
@@ -127,7 +128,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 +145,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 +164,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 +188,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 +205,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 +234,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 +252,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 +270,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 +287,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 +297,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 +309,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 +321,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 +333,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 +345,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(""));