[webkit-changes] [96511] trunk/Source/WebKit2

Mon, 03 Oct 2011 09:35:53 -0700

Title: [96511] trunk/Source/WebKit2
Revision
96511
Author
[email protected]
Date
2011-10-03 09:36:46 -0700 (Mon, 03 Oct 2011)

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

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (96510 => 96511)


--- trunk/Source/WebKit2/ChangeLog	2011-10-03 16:19:59 UTC (rev 96510)
+++ trunk/Source/WebKit2/ChangeLog	2011-10-03 16:36:46 UTC (rev 96511)
@@ -1,5 +1,25 @@
 2011-10-03  Carlos Garcia Campos  <[email protected]>
 
+        [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  <[email protected]>
+
         [GTK] Fix memory leak when loading url
         https://bugs.webkit.org/show_bug.cgi?id=69247

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp (96510 => 96511)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp	2011-10-03 16:19:59 UTC (rev 96510)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp	2011-10-03 16:36:46 UTC (rev 96511)
@@ -84,7 +84,8 @@
                                                  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 @@
                                                  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 @@
                      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 @@
                      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));

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h (96510 => 96511)


--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h	2011-10-03 16:19:59 UTC (rev 96510)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.h	2011-10-03 16:36:46 UTC (rev 96511)
@@ -53,10 +53,12 @@
     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);
 };

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c (96510 => 96511)


--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c	2011-10-03 16:19:59 UTC (rev 96510)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/testloading.c	2011-10-03 16:36:46 UTC (rev 96511)
@@ -117,7 +117,7 @@
     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 @@
     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 @@
     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);

Modified: trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list (96510 => 96511)


--- trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list	2011-10-03 16:19:59 UTC (rev 96510)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/webkit2marshal.list	2011-10-03 16:36:46 UTC (rev 96511)
@@ -1,3 +1,3 @@
-BOOLEAN:POINTER
+BOOLEAN:STRING,POINTER
 BOOLEAN:VOID
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to