Changeset 96511 in webkit

Timestamp:

Oct 3, 2011 9:36:46 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebLoaderClient.cpp (modified) (4 diffs)
• UIProcess/API/gtk/WebKitWebLoaderClient.h (modified) (1 diff)
• UIProcess/API/gtk/tests/testloading.c (modified) (3 diffs)
• UIProcess/API/gtk/webkit2marshal.list (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

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

@@ -85 +85 @@
                                                  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);
 }
 
@@ -116 +117 @@
                                                  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);
 }
 
@@ -285 +287 @@
                      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);
 
@@ -357 +360 @@
                      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);
 

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

@@ -54 +54 @@
     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);
 };

trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c

@@ -118 +118 @@
 }
 
-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();
@@ -147 +147 @@
 }
 
-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();
@@ -186 +186 @@
 }
 
-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);

trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list

@@ -1 @@
-BOOLEAN:POINTER
+BOOLEAN:STRING,POINTER
 BOOLEAN:VOID