Commit 6e5de6cc authored by mitz@apple.com's avatar 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:.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160040 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bf4100ea
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>
Deprecate WKNotificationProvider
......
......@@ -363,9 +363,9 @@ static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef f
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 @@ static void didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErr
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()];
}
}
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment