<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160231] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160231">160231</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-12-06 11:02:05 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Transition MiniBrowser to the Cocoa API: load delegate
https://bugs.webkit.org/show_bug.cgi?id=125334
Reviewed by Darin Adler.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController dealloc]): Nil out the load delegate and stop observing the
title property.
(-[WK2BrowserWindowController isPaginated]): Changed to use Cocoa SPI.
(-[WK2BrowserWindowController togglePaginationMode:]): Ditto.
(-[WK2BrowserWindowController observeValueForKeyPath:ofObject:change:context:]): Update the
window title with the title property changes.
(-[WK2BrowserWindowController awakeFromNib]): Start observing the title property. Changed to
set the load delegate instead of the load client.
(-[WK2BrowserWindowController updateTextFieldFromURL:]): Changed to use Cocoa types.
(-[WK2BrowserWindowController updateProvisionalURL]): Removed frame parameter.
(-[WK2BrowserWindowController updateCommittedURL]): Ditto.
(-[WK2BrowserWindowController browsingContextControllerDidStartProvisionalLoad:]):
Implemented this load delegate method.
(-[WK2BrowserWindowController browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:]):
Ditto.
(-[WK2BrowserWindowController browsingContextController:didFailProvisionalLoadWithError:]): Ditto.
(-[WK2BrowserWindowController browsingContextControllerDidCommitLoad:]): Ditto.
(-[WK2BrowserWindowController browsingContextControllerDidFinishLoad:]): Ditto.
(-[WK2BrowserWindowController browsingContextController:didFailLoadWithError:]): Ditto.
(-[WK2BrowserWindowController browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:]):
Ditto.
(-[WK2BrowserWindowController browsingContextController:canAuthenticateAgainstProtectionSpace:]):
Ditto.
(-[WK2BrowserWindowController browsingContextController:didReceiveAuthenticationChallenge:]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160230 => 160231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-06 18:56:35 UTC (rev 160230)
+++ trunk/Tools/ChangeLog 2013-12-06 19:02:05 UTC (rev 160231)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2013-12-06 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Transition MiniBrowser to the Cocoa API: load delegate
+ https://bugs.webkit.org/show_bug.cgi?id=125334
+
+ Reviewed by Darin Adler.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController dealloc]): Nil out the load delegate and stop observing the
+ title property.
+ (-[WK2BrowserWindowController isPaginated]): Changed to use Cocoa SPI.
+ (-[WK2BrowserWindowController togglePaginationMode:]): Ditto.
+ (-[WK2BrowserWindowController observeValueForKeyPath:ofObject:change:context:]): Update the
+ window title with the title property changes.
+ (-[WK2BrowserWindowController awakeFromNib]): Start observing the title property. Changed to
+ set the load delegate instead of the load client.
+ (-[WK2BrowserWindowController updateTextFieldFromURL:]): Changed to use Cocoa types.
+ (-[WK2BrowserWindowController updateProvisionalURL]): Removed frame parameter.
+ (-[WK2BrowserWindowController updateCommittedURL]): Ditto.
+ (-[WK2BrowserWindowController browsingContextControllerDidStartProvisionalLoad:]):
+ Implemented this load delegate method.
+ (-[WK2BrowserWindowController browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:]):
+ Ditto.
+ (-[WK2BrowserWindowController browsingContextController:didFailProvisionalLoadWithError:]): Ditto.
+ (-[WK2BrowserWindowController browsingContextControllerDidCommitLoad:]): Ditto.
+ (-[WK2BrowserWindowController browsingContextControllerDidFinishLoad:]): Ditto.
+ (-[WK2BrowserWindowController browsingContextController:didFailLoadWithError:]): Ditto.
+ (-[WK2BrowserWindowController browsingContextControllerDidChangeBackForwardList:addedItem:removedItems:]):
+ Ditto.
+ (-[WK2BrowserWindowController browsingContextController:canAuthenticateAgainstProtectionSpace:]):
+ Ditto.
+ (-[WK2BrowserWindowController browsingContextController:didReceiveAuthenticationChallenge:]): Ditto.
+
</ins><span class="cx"> 2013-12-06 Tamas Gergely <tgergely.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove function from style/checkers/cpp.py.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (160230 => 160231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-06 18:56:35 UTC (rev 160230)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-06 19:02:05 UTC (rev 160231)
</span><span class="lines">@@ -28,21 +28,15 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "AppDelegate.h"
</span><del>-#import <WebKit2/WKBrowsingContextController.h>
</del><ins>+#import <WebKit2/WKBrowsingContextControllerPrivate.h>
+#import <WebKit2/WKBrowsingContextLoadDelegatePrivate.h>
</ins><span class="cx"> #import <WebKit2/WKBrowsingContextPolicyDelegate.h>
</span><span class="cx"> #import <WebKit2/WKPagePrivate.h>
</span><span class="cx"> #import <WebKit2/WKStringCF.h>
</span><span class="cx"> #import <WebKit2/WKURLCF.h>
</span><span class="cx"> #import <WebKit2/WKViewPrivate.h>
</span><span class="cx">
</span><del>-@interface WK2BrowserWindowController () <WKBrowsingContextPolicyDelegate>
-- (void)didStartProvisionalLoadForFrame:(WKFrameRef)frame;
-- (void)didCommitLoadForFrame:(WKFrameRef)frame;
-- (void)didReceiveServerRedirectForProvisionalLoadForFrame:(WKFrameRef)frame;
-- (void)didFailProvisionalLoadWithErrorForFrame:(WKFrameRef)frame;
-- (void)didFailLoadWithErrorForFrame:(WKFrameRef)frame;
-- (void)didSameDocumentNavigationForFrame:(WKFrameRef)frame;
-- (BOOL)isPaginated;
</del><ins>+@interface WK2BrowserWindowController () <WKBrowsingContextLoadDelegatePrivate, WKBrowsingContextPolicyDelegate>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WK2BrowserWindowController {
</span><span class="lines">@@ -69,6 +63,8 @@
</span><span class="cx">
</span><span class="cx"> WKRelease(_context);
</span><span class="cx"> WKRelease(_pageGroup);
</span><ins>+ [_webView.browsingContextController removeObserver:self forKeyPath:@"title" context:[WK2BrowserWindowController self]];
+ _webView.browsingContextController.loadDelegate = nil;
</ins><span class="cx"> _webView.browsingContextController.policyDelegate = nil;
</span><span class="cx"> [_webView release];
</span><span class="cx">
</span><span class="lines">@@ -263,17 +259,17 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isPaginated
</span><span class="cx"> {
</span><del>- return WKPageGetPaginationMode(_webView.pageRef) != kWKPaginationModeUnpaginated;
</del><ins>+ return _webView.browsingContextController.paginationMode != WKPaginationModeUnpaginated;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)togglePaginationMode:(id)sender
</span><span class="cx"> {
</span><span class="cx"> if ([self isPaginated])
</span><del>- WKPageSetPaginationMode(_webView.pageRef, kWKPaginationModeUnpaginated);
</del><ins>+ _webView.browsingContextController.paginationMode = WKPaginationModeUnpaginated;
</ins><span class="cx"> else {
</span><del>- WKPageSetPaginationMode(_webView.pageRef, kWKPaginationModeLeftToRight);
- WKPageSetPageLength(_webView.pageRef, _webView.bounds.size.width / 2);
- WKPageSetGapBetweenPages(_webView.pageRef, 10);
</del><ins>+ _webView.browsingContextController.paginationMode = WKPaginationModeLeftToRight;
+ _webView.browsingContextController.pageLength = _webView.bounds.size.width / 2;
+ _webView.browsingContextController.gapBetweenPages = 10;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -303,109 +299,15 @@
</span><span class="cx"> WKPageGetSourceForFrame(_webView.pageRef, WKPageGetMainFrame(_webView.pageRef), NULL, dumpSource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// MARK: Loader Client Callbacks
-
-static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
</del><ins>+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
</ins><span class="cx"> {
</span><del>- [(WK2BrowserWindowController *)clientInfo didStartProvisionalLoadForFrame:frame];
-}
-
-static void didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didReceiveServerRedirectForProvisionalLoadForFrame:frame];
-}
-
-static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didFailProvisionalLoadWithErrorForFrame:frame];
-}
-
-static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didCommitLoadForFrame:frame];
-}
-
-static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didFinishDocumentLoadForFrame");
-}
-
-static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didFinishLoadForFrame");
-}
-
-static void didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didFailLoadWithErrorForFrame:frame];
-}
-
-static void didSameDocumentNavigationForFrame(WKPageRef page, WKFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef userData, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didSameDocumentNavigationForFrame:frame];
-}
-
-static void didReceiveTitleForFrame(WKPageRef page, WKStringRef title, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- if (!WKFrameIsMainFrame(frame))
</del><ins>+ if (context != [WK2BrowserWindowController self] || object != _webView.browsingContextController)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- WK2BrowserWindowController* controller = (WK2BrowserWindowController*)clientInfo;
- CFStringRef cfTitle = WKStringCopyCFString(0, title);
- [[controller window] setTitle:[(NSString *)cfTitle stringByAppendingString:@" [WK2]"]];
- CFRelease(cfTitle);
</del><ins>+ if ([keyPath isEqualToString:@"title"])
+ self.window.title = [_webView.browsingContextController.title stringByAppendingString:@" [WK2]"];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void didFirstLayoutForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didFirstLayoutForFrame");
-}
-
-static void didFirstVisuallyNonEmptyLayoutForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didFirstVisuallyNonEmptyLayoutForFrame");
-}
-
-static void didRemoveFrameFromHierarchy(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didRemoveFrameFromHierarchy");
-}
-
-static void didDisplayInsecureContentForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didDisplayInsecureContentForFrame");
-}
-
-static void didRunInsecureContentForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didRunInsecureContentForFrame");
-}
-
-static void didDetectXSSForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void *clientInfo)
-{
- LOG(@"didDetectXSSForFrame");
-}
-
-static void didBecomeUnresponsive(WKPageRef page, const void *clientInfo)
-{
- LOG(@"didBecomeUnresponsive");
-}
-
-static void didBecomeResponsive(WKPageRef page, const void *clientInfo)
-{
- LOG(@"didBecomeResponsive");
-}
-
-static void processDidExit(WKPageRef page, const void *clientInfo)
-{
- LOG(@"processDidExit");
-}
-
-static void didChangeBackForwardList(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo validateToolbar];
-}
-
</del><span class="cx"> // MARK: UI Client Callbacks
</span><span class="cx">
</span><span class="cx"> static WKPageRef createNewPage(WKPageRef page, WKURLRequestRef request, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton button, const void* clientInfo)
</span><span class="lines">@@ -603,47 +505,10 @@
</span><span class="cx"> [progressIndicator bind:NSHiddenBinding toObject:_webView.browsingContextController withKeyPath:@"loading" options:@{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName }];
</span><span class="cx"> [progressIndicator bind:NSValueBinding toObject:_webView.browsingContextController withKeyPath:@"estimatedProgress" options:nil];
</span><span class="cx">
</span><del>- WKPageLoaderClientV3 loadClient = {
- { 3, self },
- didStartProvisionalLoadForFrame,
- didReceiveServerRedirectForProvisionalLoadForFrame,
- didFailProvisionalLoadWithErrorForFrame,
- didCommitLoadForFrame,
- didFinishDocumentLoadForFrame,
- didFinishLoadForFrame,
- didFailLoadWithErrorForFrame,
- didSameDocumentNavigationForFrame,
- didReceiveTitleForFrame,
- didFirstLayoutForFrame,
- didFirstVisuallyNonEmptyLayoutForFrame,
- didRemoveFrameFromHierarchy,
- didDisplayInsecureContentForFrame,
- didRunInsecureContentForFrame,
- 0, // canAuthenticateAgainstProtectionSpaceInFrame
- 0, // didReceiveAuthenticationChallengeInFrame
- 0, // didStartProgress,
- 0, // didChangeProgress,
- 0, // didFinishProgress,
- didBecomeUnresponsive,
- didBecomeResponsive,
- processDidExit,
- didChangeBackForwardList,
- 0, // shouldGoToBackForwardItem
- 0, // didFailToInitializePlugin
- didDetectXSSForFrame,
- 0, // didNewFirstVisuallyNonEmptyLayout_unavailable
- 0, // willGoToBackForwardListItem
- 0, // interactionOccurredWhileProcessUnresponsive
- 0, // pluginDidFail_deprecatedForUseWithV1
- 0, // didReceiveIntentForFrame
- 0, // registerIntentServiceForFrame
- 0, // didLayout
- 0, // pluginLoadPolicy_deprecatedForUseWithV2
- 0, // pluginDidFail
- 0, // pluginLoadPolicy
- };
- WKPageSetPageLoaderClient(_webView.pageRef, &loadClient.base);
</del><ins>+ [_webView.browsingContextController addObserver:self forKeyPath:@"title" options:0 context:[WK2BrowserWindowController self]];
</ins><span class="cx">
</span><ins>+ _webView.browsingContextController.loadDelegate = self;
+
</ins><span class="cx"> _webView.browsingContextController.policyDelegate = self;
</span><span class="cx">
</span><span class="cx"> WKPageUIClientV2 uiClient = {
</span><span class="lines">@@ -698,102 +563,101 @@
</span><span class="cx"> WKPageSetPageUIClient(_webView.pageRef, &uiClient.base);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)updateTextFieldFromURL:(WKURLRef)URLRef
</del><ins>+- (void)updateTextFieldFromURL:(NSURL *)URL
</ins><span class="cx"> {
</span><del>- if (!URLRef)
</del><ins>+ if (!URL)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- static WKURLRef emptyURL = 0;
- if (!emptyURL)
- emptyURL = WKURLCreateWithUTF8CString("");
-
- if (WKURLIsEqual(URLRef, emptyURL))
</del><ins>+ if (!URL.absoluteString.length)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- CFURLRef cfSourceURL = WKURLCopyCFURL(0, URLRef);
- [urlText setStringValue:(NSString*)CFURLGetString(cfSourceURL)];
- CFRelease(cfSourceURL);
</del><ins>+ urlText.stringValue = (NSString *)CFURLGetString((CFURLRef)URL);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)updateProvisionalURLForFrame:(WKFrameRef)frame
</del><ins>+- (void)updateProvisionalURL
</ins><span class="cx"> {
</span><del>- WKURLRef url = WKFrameCopyProvisionalURL(frame);
</del><ins>+ NSURL *url = _webView.browsingContextController.provisionalURL;
</ins><span class="cx"> if (!url)
</span><span class="cx"> return;
</span><span class="cx"> [self updateTextFieldFromURL:url];
</span><del>- WKRelease(url);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)updateCommittedURLForFrame:(WKFrameRef)frame
</del><ins>+- (void)updateCommittedURL
</ins><span class="cx"> {
</span><del>- WKURLRef url = WKFrameCopyURL(frame);
</del><ins>+ NSURL *url = _webView.browsingContextController.committedURL;
</ins><span class="cx"> if (!url)
</span><span class="cx"> return;
</span><span class="cx"> [self updateTextFieldFromURL:url];
</span><del>- WKRelease(url);
</del><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didStartProvisionalLoadForFrame:(WKFrameRef)frame
</del><ins>+- (void)loadURLString:(NSString *)urlString
</ins><span class="cx"> {
</span><del>- if (!WKFrameIsMainFrame(frame))
- return;
-
- [self updateProvisionalURLForFrame:frame];
</del><ins>+ // FIXME: We shouldn't have to set the url text here.
+ [urlText setStringValue:urlString];
+ [self fetch:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didReceiveServerRedirectForProvisionalLoadForFrame:(WKFrameRef)frame
</del><ins>+- (IBAction)performFindPanelAction:(id)sender
</ins><span class="cx"> {
</span><del>- if (!WKFrameIsMainFrame(frame))
- return;
-
- [self updateProvisionalURLForFrame:frame];
</del><ins>+ [findPanelWindow makeKeyAndOrderFront:sender];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didFailProvisionalLoadWithErrorForFrame:(WKFrameRef)frame
</del><ins>+- (IBAction)find:(id)sender
</ins><span class="cx"> {
</span><del>- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ WKStringRef string = WKStringCreateWithCFString((CFStringRef)[sender stringValue]);
</ins><span class="cx">
</span><del>- [self updateProvisionalURLForFrame:frame];
</del><ins>+ WKPageFindString(_webView.pageRef, string, kWKFindOptionsCaseInsensitive | kWKFindOptionsWrapAround | kWKFindOptionsShowFindIndicator | kWKFindOptionsShowOverlay, 100);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didFailLoadWithErrorForFrame:(WKFrameRef)frame
</del><ins>+#pragma mark WKBrowsingContextLoadDelegate
+
+- (void)browsingContextControllerDidStartProvisionalLoad:(WKBrowsingContextController *)sender
</ins><span class="cx"> {
</span><del>- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ [self updateProvisionalURL];
+}
</ins><span class="cx">
</span><del>- [self updateProvisionalURLForFrame:frame];
</del><ins>+- (void)browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:(WKBrowsingContextController *)sender
+{
+ [self updateProvisionalURL];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didSameDocumentNavigationForFrame:(WKFrameRef)frame
</del><ins>+- (void)browsingContextController:(WKBrowsingContextController *)sender didFailProvisionalLoadWithError:(NSError *)error
</ins><span class="cx"> {
</span><ins>+ [self updateProvisionalURL];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didCommitLoadForFrame:(WKFrameRef)frame
</del><ins>+- (void)browsingContextControllerDidCommitLoad:(WKBrowsingContextController *)sender
</ins><span class="cx"> {
</span><del>- if (!WKFrameIsMainFrame(frame))
- return;
</del><ins>+ [self updateCommittedURL];
+}
</ins><span class="cx">
</span><del>- [self updateCommittedURLForFrame:frame];
</del><ins>+- (void)browsingContextControllerDidFinishLoad:(WKBrowsingContextController *)sender
+{
+ LOG(@"didFinishLoad");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)loadURLString:(NSString *)urlString
</del><ins>+- (void)browsingContextController:(WKBrowsingContextController *)sender didFailLoadWithError:(NSError *)error
</ins><span class="cx"> {
</span><del>- // FIXME: We shouldn't have to set the url text here.
- [urlText setStringValue:urlString];
- [self fetch:nil];
</del><ins>+ [self updateProvisionalURL];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)performFindPanelAction:(id)sender
</del><ins>+- (void)browsingContextControllerDidChangeBackForwardList:(WKBrowsingContextController *)sender addedItem:(WKBackForwardListItem *)addedItem removedItems:(NSArray *)removedItems
</ins><span class="cx"> {
</span><del>- [findPanelWindow makeKeyAndOrderFront:sender];
</del><ins>+ [self validateToolbar];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (IBAction)find:(id)sender
</del><ins>+#pragma mark WKBrowsingContextLoadDelegatePrivate
+
+- (BOOL)browsingContextController:(WKBrowsingContextController *)sender canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
</ins><span class="cx"> {
</span><del>- WKStringRef string = WKStringCreateWithCFString((CFStringRef)[sender stringValue]);
</del><ins>+ LOG(@"canAuthenticateAgainstProtectionSpace: %@", protectionSpace);
+ return YES;
+}
</ins><span class="cx">
</span><del>- WKPageFindString(_webView.pageRef, string, kWKFindOptionsCaseInsensitive | kWKFindOptionsWrapAround | kWKFindOptionsShowFindIndicator | kWKFindOptionsShowOverlay, 100);
</del><ins>+- (void)browsingContextController:(WKBrowsingContextController *)sender didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+ LOG(@"didReceiveAuthenticationChallenge: %@", challenge);
+ [challenge.sender continueWithoutCredentialForAuthenticationChallenge:challenge];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKBrowsingContextPolicyDelegate
</span></span></pre>
</div>
</div>
</body>
</html>