[GTK] Add failing uri parameter to provisional-load-failed and load-failed signals

https://bugs.webkit.org/show_bug.cgi?id=69252

Reviewed by Martin Robinson.

* UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
(didFailProvisionalLoadWithErrorForFrame): Pass failing URL to
signal handler.
(didFailLoadWithErrorForFrame): Ditto.
(webkit_web_loader_client_class_init): Add failing URL parameter
to provisional-load-failed and load-failed signals.
* UIProcess/API/gtk/WebKitWebLoaderClient.h:
* UIProcess/API/gtk/tests/testloading.c:
(loadStatusProvisionalLoadFailed): Update to API changes.
(loadStatusLoadFailed): Ditto.
(loadErrorProvisionalLoadFailed): Ditto.
* UIProcess/API/gtk/webkit2marshal.list:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c640423..1042c45 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,25 @@
 2011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        [GTK] Add failing uri parameter to provisional-load-failed and load-failed signals
+        https://bugs.webkit.org/show_bug.cgi?id=69252
+
+        Reviewed by Martin Robinson.
+
+        * UIProcess/API/gtk/WebKitWebLoaderClient.cpp:
+        (didFailProvisionalLoadWithErrorForFrame): Pass failing URL to
+        signal handler.
+        (didFailLoadWithErrorForFrame): Ditto.
+        (webkit_web_loader_client_class_init): Add failing URL parameter
+        to provisional-load-failed and load-failed signals.
+        * UIProcess/API/gtk/WebKitWebLoaderClient.h:
+        * UIProcess/API/gtk/tests/testloading.c:
+        (loadStatusProvisionalLoadFailed): Update to API changes.
+        (loadStatusLoadFailed): Ditto.
+        (loadErrorProvisionalLoadFailed): Ditto.
+        * UIProcess/API/gtk/webkit2marshal.list:
+
+2011-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         [GTK] Fix memory leak when loading url
         https://bugs.webkit.org/show_bug.cgi?id=69247
 

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
index d623008..978a996 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp
@@ -84,7 +84,8 @@ static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef f
                                                  resourceError.errorCode(),
                                                  resourceError.localizedDescription().utf8().data()));
     gboolean returnValue;
-    g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[PROVISIONAL_LOAD_FAILED], 0, webError.get(), &returnValue);
+    g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[PROVISIONAL_LOAD_FAILED], 0, resourceError.failingURL().utf8().data(),
+                  webError.get(), &returnValue);
 }
 
 static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
@@ -115,7 +116,8 @@ static void didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErr
                                                  resourceError.errorCode(),
                                                  resourceError.localizedDescription().utf8().data()));
     gboolean returnValue;
-    g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[LOAD_FAILED], 0, webError.get(), &returnValue);
+    g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[LOAD_FAILED], 0, resourceError.failingURL().utf8().data(),
+                  webError.get(), &returnValue);
 }
 
 static void webkitWebLoaderClientConstructed(GObject* object)
@@ -284,8 +286,9 @@ static void webkit_web_loader_client_class_init(WebKitWebLoaderClientClass* clie
                      G_SIGNAL_RUN_LAST,
                      G_STRUCT_OFFSET(WebKitWebLoaderClientClass, provisional_load_failed),
                      g_signal_accumulator_true_handled, NULL,
-                     webkit_marshal_BOOLEAN__POINTER,
-                     G_TYPE_BOOLEAN, 1,
+                     webkit_marshal_BOOLEAN__STRING_POINTER,
+                     G_TYPE_BOOLEAN, 2,
+                     G_TYPE_STRING,
                      G_TYPE_POINTER);
 
     /**
@@ -356,8 +359,9 @@ static void webkit_web_loader_client_class_init(WebKitWebLoaderClientClass* clie
                      G_SIGNAL_RUN_LAST,
                      G_STRUCT_OFFSET(WebKitWebLoaderClientClass, load_failed),
                      g_signal_accumulator_true_handled, NULL,
-                     webkit_marshal_BOOLEAN__POINTER,
-                     G_TYPE_BOOLEAN, 1,
+                     webkit_marshal_BOOLEAN__STRING_POINTER,
+                     G_TYPE_BOOLEAN, 2,
+                     G_TYPE_STRING,
                      G_TYPE_POINTER);
 
     g_type_class_add_private(clientClass, sizeof(WebKitWebLoaderClientPrivate));

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h b/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h
index 7bf16d1..be6bb27 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h
@@ -53,10 +53,12 @@ struct _WebKitWebLoaderClientClass {
     gboolean (* provisional_load_started)                  (WebKitWebLoaderClient *loader_client);
     gboolean (* provisional_load_received_server_redirect) (WebKitWebLoaderClient *loader_client);
     gboolean (* provisional_load_failed)                   (WebKitWebLoaderClient *loader_client,
+                                                            const gchar           *failing_uri,
                                                             GError                *error);
     gboolean (* load_committed)                            (WebKitWebLoaderClient *loader_client);
     gboolean (* load_finished)                             (WebKitWebLoaderClient *loader_client);
     gboolean (* load_failed)                               (WebKitWebLoaderClient *loader_client,
+                                                            const gchar           *failing_uri,
                                                             GError                *error);
 };
 

diff --git a/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c b/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
index 26933b7..74982c0 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
+++ b/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c
@@ -117,7 +117,7 @@ static gboolean loadStatusProvisionalLoadReceivedServerRedirect(WebKitWebLoaderC
     return TRUE;
 }
 
-static gboolean loadStatusProvisionalLoadFailed(WebKitWebLoaderClient *client, GError *error, WebLoadingFixture *fixture)
+static gboolean loadStatusProvisionalLoadFailed(WebKitWebLoaderClient *client, const gchar *failingURI, GError *error, WebLoadingFixture *fixture)
 {
     g_assert_not_reached();
     return TRUE;
@@ -146,7 +146,7 @@ static gboolean loadStatusLoadFinished(WebKitWebLoaderClient *client, WebLoading
     return TRUE;
 }
 
-static gboolean loadStatusLoadFailed(WebKitWebLoaderClient *client, GError *error, WebLoadingFixture *fixture)
+static gboolean loadStatusLoadFailed(WebKitWebLoaderClient *client, const gchar *failingURI, GError *error, WebLoadingFixture *fixture)
 {
     g_assert_not_reached();
     return TRUE;
@@ -185,7 +185,7 @@ static gboolean loadErrorProvisionalLoadStarted(WebKitWebLoaderClient *client, W
     return TRUE;
 }
 
-static gboolean loadErrorProvisionalLoadFailed(WebKitWebLoaderClient *client, GError *error, WebLoadingFixture *fixture)
+static gboolean loadErrorProvisionalLoadFailed(WebKitWebLoaderClient *client, const gchar *failingURI, GError *error, WebLoadingFixture *fixture)
 {
     g_assert(fixture->hasBeenProvisional);
     g_assert(!fixture->hasBeenFailed);

diff --git a/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list b/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list
index 6e84442..c3a1786 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list
+++ b/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list
@@ -1,3 +1,3 @@
-BOOLEAN:POINTER
+BOOLEAN:STRING,POINTER
 BOOLEAN:VOID