Changeset 141392 in webkit

Timestamp:

Jan 31, 2013 2:02:04 AM (11 years ago)

Author:

jochen@chromium.org

Message:

[chromium] move runModalBeforeUnloadDialog to TestRunner library
​https://bugs.webkit.org/show_bug.cgi?id=108442

Reviewed by Adam Barth.

• DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:

(WebTestRunner::WebTestProxy::runModalBeforeUnloadDialog):

• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:

(WebTestRunner::WebTestProxyBase::runModalBeforeUnloadDialog):

• DumpRenderTree/chromium/WebViewHost.cpp:
• DumpRenderTree/chromium/WebViewHost.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h (modified) (1 diff)
• DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebViewHost.cpp (modified) (2 diffs)
• DumpRenderTree/chromium/WebViewHost.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-31  Jochen Eisinger  <jochen@chromium.org>
+
+        [chromium] move runModalBeforeUnloadDialog to TestRunner library
+        https://bugs.webkit.org/show_bug.cgi?id=108442
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h:
+        (WebTestRunner::WebTestProxy::runModalBeforeUnloadDialog):
+        * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+        (WebTestRunner::WebTestProxyBase::runModalBeforeUnloadDialog):
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        * DumpRenderTree/chromium/WebViewHost.h:
+
 2013-01-31  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

@@ -466 +466 @@
     virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame* frame, const WebKit::WebString& message)
     {
-        WebTestProxyBase::runModalBeforeUnloadDialog(frame, message);
-        return Base::runModalBeforeUnloadDialog(frame, message);
+        return WebTestProxyBase::runModalBeforeUnloadDialog(frame, message);
     }
     virtual WebKit::WebNavigationPolicy decidePolicyForNavigation(WebKit::WebFrame* frame, const WebKit::WebURLRequest& request, WebKit::WebNavigationType type, const WebKit::WebNode& originatingNode, WebKit::WebNavigationPolicy defaultPolicy, bool isRedirect)

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp

@@ -976 +976 @@
 {
     m_delegate->printMessage(string("CONFIRM NAVIGATION: ") + message.utf8().data() + "\n");
-    return true;
+    if (!m_testInterfaces->testRunner())
+        return true;
+    return !m_testInterfaces->testRunner()->shouldStayOnPageAfterHandlingBeforeUnload();
 }
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -237 +237 @@
 }
 
-bool WebViewHost::runModalBeforeUnloadDialog(WebFrame*, const WebString& message)
-{
-    return !testRunner()->shouldStayOnPageAfterHandlingBeforeUnload();
-}
-
 void WebViewHost::showContextMenu(WebFrame*, const WebContextMenuData& contextMenuData)
 {
@@ -1135 +1130 @@
 // Private functions ----------------------------------------------------------
 
-::WebTestRunner::WebTestRunner* WebViewHost::testRunner() const
-{
-    return m_shell->testRunner();
-}
-
 void WebViewHost::updateForCommittedLoad(WebFrame* frame, bool isNewNavigation)
 {

trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

@@ -208 +208 @@
     virtual bool runModalConfirmDialog(WebKit::WebFrame*, const WebKit::WebString&);
     virtual bool runModalPromptDialog(WebKit::WebFrame*, const WebKit::WebString& message, const WebKit::WebString& defaultValue, WebKit::WebString* actualValue);
-    virtual bool runModalBeforeUnloadDialog(WebKit::WebFrame*, const WebKit::WebString&);
     virtual void showContextMenu(WebKit::WebFrame*, const WebKit::WebContextMenuData&);
     virtual void didUpdateLayout();
@@ -303 +302 @@
     };
 
-    WebTestRunner::WebTestRunner* testRunner() const;
-
     // Called the title of the page changes.
     // Can be used to update the title of the window.