Changeset 154329 in webkit

Timestamp:

Aug 20, 2013 8:57:38 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

<​https://webkit.org/b/119487> [Gtk] Cancel authentication on load failed

Patch by Anton Obzhirov <Anton Obzhirov> on 2013-08-20
Reviewed by Martin Robinson.

Added callback to handle load-failed event in default authentication dialog.
Authentication request gets cancelled and the dialog widget gets destroyed.

• UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:

(pageLoadFailed):
(webkitAuthenticationDialogInitialize):
(webkitAuthenticationDialogDispose):
(webkit_authentication_dialog_class_init):
(webkitAuthenticationDialogNew):

• UIProcess/API/gtk/WebKitAuthenticationDialog.h:
• UIProcess/API/gtk/WebKitWebView.cpp:

(webkitWebViewAuthenticate):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-08-20  Anton Obzhirov  <a.obzhirov@samsung.com>
+
+        <https://webkit.org/b/119487> [Gtk] Cancel authentication on load failed
+
+        Reviewed by Martin Robinson.
+
+        Added callback to handle load-failed event in default authentication dialog.
+        Authentication request gets cancelled and the dialog widget gets destroyed.
+
+        * UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
+        (pageLoadFailed):
+        (webkitAuthenticationDialogInitialize):
+        (webkitAuthenticationDialogDispose):
+        (webkit_authentication_dialog_class_init):
+        (webkitAuthenticationDialogNew):
+        * UIProcess/API/gtk/WebKitAuthenticationDialog.h:
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewAuthenticate):
+
 2013-08-20  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

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

@@ -25 +25 @@
 #include "WebKitCredentialPrivate.h"
 #include "WebKitPrivate.h"
+#include "WebKitWebView.h"
 
 using namespace WebKit;
@@ -32 +33 @@
     GtkWidget* authWidget;
     GtkWidget* defaultButton;
+    unsigned long loadFailedEventID;
     GRefPtr<GtkStyleContext> styleContext;
+    WebKitWebView* webView;
 };
 
@@ -52 +55 @@
 }
 
-static void webkitAuthenticationDialogInitialize(WebKitAuthenticationDialog* authDialog, CredentialStorageMode credentialStorageMode)
+static void pageLoadFailed(WebKitWebView*, WebKitLoadEvent, const char*, GError*, WebKitAuthenticationDialog* authDialog)
+{
+    webkit_authentication_request_cancel(authDialog->priv->request.get());
+    gtk_widget_destroy(GTK_WIDGET(authDialog));
+}
+
+static void webkitAuthenticationDialogInitialize(WebKitAuthenticationDialog* authDialog, CredentialStorageMode credentialStorageMode, WebKitWebView* webView)
 {
     GtkWidget* frame = gtk_frame_new(0);
@@ -89 +98 @@
     gtk_container_add(GTK_CONTAINER(authDialog), frame);
     gtk_widget_show(frame);
+
+    authDialog->priv->webView = webView;
+    authDialog->priv->loadFailedEventID = g_signal_connect(webView, "load-failed", G_CALLBACK(pageLoadFailed), authDialog);
 }
 
@@ -125 +137 @@
 }
 
+static void webkitAuthenticationDialogDispose(GObject* object)
+{
+    WebKitAuthenticationDialogPrivate* priv = WEBKIT_AUTHENTICATION_DIALOG(object)->priv;
+    if (priv->loadFailedEventID) {
+        g_signal_handler_disconnect(priv->webView, priv->loadFailedEventID);
+        priv->loadFailedEventID = 0;
+    }
+
+    G_OBJECT_CLASS(webkit_authentication_dialog_parent_class)->dispose(object);
+}
+
 static void webkit_authentication_dialog_class_init(WebKitAuthenticationDialogClass* klass)
 {
     GObjectClass* objectClass = G_OBJECT_CLASS(klass);
     objectClass->constructed = webkitAuthenticationDialogConstructed;
+    objectClass->dispose = webkitAuthenticationDialogDispose;
 
     GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(klass);
@@ -135 +159 @@
 }
 
-GtkWidget* webkitAuthenticationDialogNew(WebKitAuthenticationRequest* request, CredentialStorageMode mode)
+GtkWidget* webkitAuthenticationDialogNew(WebKitAuthenticationRequest* request, CredentialStorageMode mode, WebKitWebView* webView)
 {
     WebKitAuthenticationDialog* authDialog = WEBKIT_AUTHENTICATION_DIALOG(g_object_new(WEBKIT_TYPE_AUTHENTICATION_DIALOG, NULL));
     authDialog->priv->request = request;
-    webkitAuthenticationDialogInitialize(authDialog, mode);
+    webkitAuthenticationDialogInitialize(authDialog, mode, webView);
     return GTK_WIDGET(authDialog);
 }

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.h

@@ -23 +23 @@
 #include "WebKitAuthenticationRequest.h"
 #include "WebKitAuthenticationWidget.h"
+#include "WebKitWebView.h"
 #include <gtk/gtk.h>
 
@@ -49 +50 @@
 
 GType webkit_authentication_dialog_get_type();
-GtkWidget* webkitAuthenticationDialogNew(WebKitAuthenticationRequest*, CredentialStorageMode);
+GtkWidget* webkitAuthenticationDialogNew(WebKitAuthenticationRequest*, CredentialStorageMode, WebKitWebView*);
 
 G_END_DECLS

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

@@ -436 +436 @@
 {
     CredentialStorageMode credentialStorageMode = webkit_authentication_request_can_save_credentials(request) ? AllowPersistentStorage : DisallowPersistentStorage;
-    webkitWebViewBaseAddAuthenticationDialog(WEBKIT_WEB_VIEW_BASE(webView), webkitAuthenticationDialogNew(request, credentialStorageMode));
+    webkitWebViewBaseAddAuthenticationDialog(WEBKIT_WEB_VIEW_BASE(webView), webkitAuthenticationDialogNew(request, credentialStorageMode, webView));
 
     return TRUE;