Changeset 160040 in webkit

Timestamp:

Dec 3, 2013, 2:32:20 PM (11 years ago)

Author:

mitz@apple.com

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKBrowsingContextController.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-03  Dan Bernstein  <mitz@apple.com>
+
+        [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  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm

@@ -364 +364 @@
 
     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()];
     }
 }
@@ -396 +396 @@
 
     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()];
     }
 }

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextLoadDelegate.h

@@ -38 +38 @@
 - (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. */
@@ -48 +48 @@
 
 /* Sent if the commited load fails. */
-- (void)browsingContextControllerDidFailLoad:(WKBrowsingContextController *)sender withError:(NSError *)error;
+- (void)browsingContextController:(WKBrowsingContextController *)sender didFailLoadWithError:(NSError *)error;
 
 - (void)browsingContextControllerDidStartProgress:(WKBrowsingContextController *)sender;