Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)

New snapshot with prospective Mountain Lion build fix

1 files changed, 18 insertions, 1 deletions

diff --git a/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp b/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp
index b7c85edfb..edd50dfab 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp
+++ b/Tools/DumpRenderTree/chromium/TestRunner/TestInterfaces.cpp
@@ -47,7 +47,8 @@ public:
     Internal();
     ~Internal();
 
-    void setWebView(WebView* webView);
+    void setWebView(WebView*);
+    void setDelegate(TestDelegate*);
     void bindTo(WebFrame*);
     void resetAll();
 
@@ -71,6 +72,10 @@ TestInterfaces::Internal::~Internal()
     m_accessibilityController->setWebView(0);
     // m_gamepadController doesn't depend on WebView.
     m_textInputController->setWebView(0);
+
+    // m_accessibilityController doesn't depend on TestDelegate.
+    m_gamepadController->setDelegate(0);
+    // m_textInputController doesn't depend on TestDelegate.
 }
 
 void TestInterfaces::Internal::setWebView(WebView* webView)
@@ -80,6 +85,13 @@ void TestInterfaces::Internal::setWebView(WebView* webView)
     m_textInputController->setWebView(webView);
 }
 
+void TestInterfaces::Internal::setDelegate(TestDelegate* delegate)
+{
+    // m_accessibilityController doesn't depend on TestDelegate.
+    m_gamepadController->setDelegate(delegate);
+    // m_textInputController doesn't depend on TestDelegate.
+}
+
 void TestInterfaces::Internal::bindTo(WebFrame* frame)
 {
     m_accessibilityController->bindToJavascript(frame, WebString::fromUTF8("accessibilityController"));
@@ -109,6 +121,11 @@ void TestInterfaces::setWebView(WebView* webView)
     m_internal->setWebView(webView);
 }
 
+void TestInterfaces::setDelegate(TestDelegate* delegate)
+{
+    m_internal->setDelegate(delegate);
+}
+
 void TestInterfaces::bindTo(WebFrame* frame)
 {
     m_internal->bindTo(frame);