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

Tue, 03 Dec 2013 14:30:16 -0800

Title: [160040] trunk/Source/WebKit2
Revision
160040
Author
[email protected]
Date
2013-12-03 14:32:20 -0800 (Tue, 03 Dec 2013)

Log Message

[Cocoa] Give two load delegate methods more conventional names
https://bugs.webkit.org/show_bug.cgi?id=125183

Reviewed by Anders Carlsson.

* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(didFailProvisionalLoadWithErrorForFrame): Updated for rename.
(didFailLoadWithErrorForFrame): Ditto.
* UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Renamed
-browsingContextControllerDidFailProvisionalLoad:withError: to
-browsingContextController:didFailProvisionalLoadWithError: and
-browsingContextControllerDidFailLoad:withError: to
-browsingContextController:didFailLoadWithError:.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (160039 => 160040)


--- trunk/Source/WebKit2/ChangeLog	2013-12-03 22:29:39 UTC (rev 160039)
+++ trunk/Source/WebKit2/ChangeLog	2013-12-03 22:32:20 UTC (rev 160040)
@@ -1,3 +1,19 @@
+2013-12-03  Dan Bernstein  <[email protected]>
+
+        [Cocoa] Give two load delegate methods more conventional names
+        https://bugs.webkit.org/show_bug.cgi?id=125183
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+        (didFailProvisionalLoadWithErrorForFrame): Updated for rename.
+        (didFailLoadWithErrorForFrame): Ditto.
+        * UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h: Renamed
+        -browsingContextControllerDidFailProvisionalLoad:withError: to
+        -browsingContextController:didFailProvisionalLoadWithError: and
+        -browsingContextControllerDidFailLoad:withError: to
+        -browsingContextController:didFailLoadWithError:.
+
 2013-12-03  Anders Carlsson  <[email protected]>
 
         Deprecate WKNotificationProvider

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160039 => 160040)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm	2013-12-03 22:29:39 UTC (rev 160039)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm	2013-12-03 22:32:20 UTC (rev 160040)
@@ -363,9 +363,9 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidFailProvisionalLoad:withError:)]) {
+    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:didFailProvisionalLoadWithError:)]) {
         RetainPtr<NSError> nsError = adoptNS(createErrorWithRecoveryAttempter(error, frame, browsingContext));
-        [browsingContext.loadDelegate browsingContextControllerDidFailProvisionalLoad:browsingContext withError:nsError.get()];
+        [browsingContext.loadDelegate browsingContextController:browsingContext didFailProvisionalLoadWithError:nsError.get()];
     }
 }
 
@@ -395,9 +395,9 @@
         return;
 
     WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
-    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidFailLoad:withError:)]) {
+    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:didFailLoadWithError:)]) {
         RetainPtr<NSError> nsError = adoptNS(createErrorWithRecoveryAttempter(error, frame, browsingContext));
-        [browsingContext.loadDelegate browsingContextControllerDidFailLoad:browsingContext withError:nsError.get()];
+        [browsingContext.loadDelegate browsingContextController:browsingContext didFailLoadWithError:nsError.get()];
     }
 }

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (160039 => 160040)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h	2013-12-03 22:29:39 UTC (rev 160039)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h	2013-12-03 22:32:20 UTC (rev 160040)
@@ -37,8 +37,8 @@
 /* Sent if a server-side redirect was recieved. */
 - (void)browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:(WKBrowsingContextController *)sender;
 
-/* Sent if the provional load fails. */
-- (void)browsingContextControllerDidFailProvisionalLoad:(WKBrowsingContextController *)sender withError:(NSError *)error;
+/* Sent if the provisional load fails. */
+- (void)browsingContextController:(WKBrowsingContextController *)sender didFailProvisionalLoadWithError:(NSError *)error;
 
 /* Sent when the load gets committed. */
 - (void)browsingContextControllerDidCommitLoad:(WKBrowsingContextController *)sender;
@@ -47,7 +47,7 @@
 - (void)browsingContextControllerDidFinishLoad:(WKBrowsingContextController *)sender;
 
 /* Sent if the commited load fails. */
-- (void)browsingContextControllerDidFailLoad:(WKBrowsingContextController *)sender withError:(NSError *)error;
+- (void)browsingContextController:(WKBrowsingContextController *)sender didFailLoadWithError:(NSError *)error;
 
 - (void)browsingContextControllerDidStartProgress:(WKBrowsingContextController *)sender;
 - (void)browsingContextController:(WKBrowsingContextController *)sender estimatedProgressChangedTo:(double)estimatedProgress;

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

Reply via email to