Title: [171796] trunk/Source/WebKit2
- Revision
- 171796
- Author
- [email protected]
- Date
- 2014-07-30 03:52:33 -0700 (Wed, 30 Jul 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171795 => 171796)
--- trunk/Source/WebKit2/ChangeLog 2014-07-30 07:47:33 UTC (rev 171795)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-30 10:52:33 UTC (rev 171796)
@@ -1,3 +1,25 @@
+2014-07-30 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
[GTK] Remove WebKitCertificateInfo from WebKit2GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (171795 => 171796)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-07-30 07:47:33 UTC (rev 171795)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-07-30 10:52:33 UTC (rev 171796)
@@ -496,7 +496,6 @@
// The related view is only valid during the construction.
priv->relatedView = nullptr;
- webkitWebViewUpdateSettings(webView);
webkitWebViewBaseSetDownloadRequestHandler(WEBKIT_WEB_VIEW_BASE(webView), webkitWebViewHandleDownloadRequest);
attachLoaderClientToView(webView);
@@ -506,6 +505,10 @@
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()));
priv->windowProperties = adoptGRef(webkitWindowPropertiesCreate());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
