<!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>[159895] trunk/Source/WebKit2</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/159895">159895</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-11-30 22:24:05 -0800 (Sat, 30 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
https://bugs.webkit.org/show_bug.cgi?id=125040
Reviewed by Sam Weinig.
* Shared/Cocoa/WKNSURLExtras.h: Declared new method.
* Shared/Cocoa/WKNSURLExtras.mm:
(urlWithWTFString): Added helper function.
(+[NSURL _web_URLWithWTFString:]): Added.
(+[NSURL _web_URLWithWTFString:relativeToURL:]): Changed to use helper function.
* UIProcess/API/Cocoa/WKBackForwardListItem.mm:
(-[WKBackForwardListItem URL]): Changed to call new method.
(-[WKBackForwardListItem originalURL]): Ditto.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController activeURL]): Ditto.
(-[WKBrowsingContextController provisionalURL]): Ditto.
(-[WKBrowsingContextController committedURL]): Ditto.
(-[WKBrowsingContextController unreachableURL]): Ditto.
(setUpPagePolicyClient): Ditto.
* UIProcess/API/Cocoa/WKNavigationData.mm:
(-[WKNavigationData destinationURL]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLExtrash">trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLExtrasmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDatamm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2013-11-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Added a version of +[NSURL _web_URLWithWTFString:relativeToURL:] that doesn’t take a base URL and switched all callers to it.
+ https://bugs.webkit.org/show_bug.cgi?id=125040
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Cocoa/WKNSURLExtras.h: Declared new method.
+ * Shared/Cocoa/WKNSURLExtras.mm:
+ (urlWithWTFString): Added helper function.
+ (+[NSURL _web_URLWithWTFString:]): Added.
+ (+[NSURL _web_URLWithWTFString:relativeToURL:]): Changed to use helper function.
+ * UIProcess/API/Cocoa/WKBackForwardListItem.mm:
+ (-[WKBackForwardListItem URL]): Changed to call new method.
+ (-[WKBackForwardListItem originalURL]): Ditto.
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController activeURL]): Ditto.
+ (-[WKBrowsingContextController provisionalURL]): Ditto.
+ (-[WKBrowsingContextController committedURL]): Ditto.
+ (-[WKBrowsingContextController unreachableURL]): Ditto.
+ (setUpPagePolicyClient): Ditto.
+ * UIProcess/API/Cocoa/WKNavigationData.mm:
+ (-[WKNavigationData destinationURL]): Ditto.
+
+2013-11-30 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [Cocoa] Stop using the WKPageRef API in WKBrowsingContextController
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125036
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.h 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> @interface NSURL (WKExtras)
</span><span class="cx">
</span><ins>++ (instancetype)_web_URLWithWTFString:(const String&)string;
</ins><span class="cx"> + (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL;
</span><span class="cx">
</span><span class="cx"> - (String)_web_originalDataAsWTFString;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation NSURL (WKExtras)
</span><span class="cx">
</span><del>-+ (instancetype)_web_URLWithWTFString:(const WTF::String&)string relativeToURL:(NSURL *)baseURL
</del><ins>+static inline NSURL *urlWithWTFString(const String& string, NSURL *baseURL = nil)
</ins><span class="cx"> {
</span><span class="cx"> if (!string)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -43,6 +43,16 @@
</span><span class="cx"> return CFBridgingRelease(createCFURLFromBuffer(buffer.data(), buffer.length(), (CFURLRef)baseURL).leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (instancetype)_web_URLWithWTFString:(const String&)string
+{
+ return urlWithWTFString(string);
+}
+
++ (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL
+{
+ return urlWithWTFString(string, baseURL);
+}
+
</ins><span class="cx"> - (String)_web_originalDataAsWTFString
</span><span class="cx"> {
</span><span class="cx"> CString originalData;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.mm 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)URL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_item->url() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_item->url()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)title
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)originalURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_item->originalURL() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_item->originalURL()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -277,22 +277,22 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)activeURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)provisionalURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().provisionalURL()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)committedURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_page->pageLoadState().url() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().url()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURL *)unreachableURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().unreachableURL()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (double)estimatedProgress
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx">
</span><span class="cx"> if (originatingFrame) {
</span><span class="cx"> actionDictionary = [[actionDictionary mutableCopy] autorelease];
</span><del>- [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url() relativeToURL:nil] forKey:WKActionOriginatingFrameURLKey];
</del><ins>+ [(NSMutableDictionary *)actionDictionary setObject:[NSURL _web_URLWithWTFString:toImpl(originatingFrame)->url()] forKey:WKActionOriginatingFrameURLKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [browsingContext.policyDelegate browsingContextController:browsingContext decidePolicyForNavigationAction:actionDictionary decisionHandler:makePolicyDecisionBlock(listener)];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm (159894 => 159895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-12-01 06:02:32 UTC (rev 159894)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.mm 2013-12-01 06:24:05 UTC (rev 159895)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSURL *)destinationURL
</span><span class="cx"> {
</span><del>- return [NSURL _web_URLWithWTFString:_data->url() relativeToURL:nil];
</del><ins>+ return [NSURL _web_URLWithWTFString:_data->url()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURLResponse *)response
</span></span></pre>
</div>
</div>
</body>
</html>