Changeset 171796 in webkit

Timestamp:

Jul 30, 2014, 3:52:33 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] REGRESSION(r171742): Test /webkit2/WebKitWebView/disallow-modal-dialogs fails
​https://bugs.webkit.org/show_bug.cgi?id=135412

Reviewed by Philippe Normand.

The problem is that WebPageProxy::setUIClient() calls
setCanRunModal() with the value of m_uiClient->canRunModal() which
is always true for us. We override that manually by calling
setCanRunModal() depending on the WebKitSettings. In r171742,
webkitWebViewUpdateSettings(), the method that overrides
setCanRunModal(), was moved before attachUIClientToView(), so the
value set by WebPageProxy::setUIClient() is the last one and takes
precedence. We need to make sure webkitWebViewUpdateSettings() is
always called after attachUIClientToView().

• UIProcess/API/gtk/WebKitWebView.cpp:

(webkitWebViewConstructed): Move webkitWebViewUpdateSettings()
call after attachUIClientToView() and add a comment to not forget
about it again.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebView.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-30  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] REGRESSION(r171742): Test /webkit2/WebKitWebView/disallow-modal-dialogs fails
+        https://bugs.webkit.org/show_bug.cgi?id=135412
+
+        Reviewed by Philippe Normand.
+
+        The problem is that WebPageProxy::setUIClient() calls
+        setCanRunModal() with the value of m_uiClient->canRunModal() which
+        is always true for us. We override that manually by calling
+        setCanRunModal() depending on the WebKitSettings. In r171742,
+        webkitWebViewUpdateSettings(), the method that overrides
+        setCanRunModal(), was moved before attachUIClientToView(), so the
+        value set by WebPageProxy::setUIClient() is the last one and takes
+        precedence. We need to make sure webkitWebViewUpdateSettings() is
+        always called after attachUIClientToView().
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewConstructed): Move webkitWebViewUpdateSettings()
+        call after attachUIClientToView() and add a comment to not forget
+        about it again.
+
 2014-07-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

@@ -497 +497 @@
     priv->relatedView = nullptr;
 
-    webkitWebViewUpdateSettings(webView);
     webkitWebViewBaseSetDownloadRequestHandler(WEBKIT_WEB_VIEW_BASE(webView), webkitWebViewHandleDownloadRequest);
 
@@ -506 +505 @@
     attachContextMenuClientToView(webView);
     attachFormClientToView(webView);
+
+    // This needs to be after attachUIClientToView() because WebPageProxy::setUIClient() calls setCanRunModal() with true.
+    // See https://bugs.webkit.org/show_bug.cgi?id=135412.
+    webkitWebViewUpdateSettings(webView);
 
     priv->backForwardList = adoptGRef(webkitBackForwardListCreate(&getPage(webView)->backForwardList()));