<!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>[208945] trunk/Source/WebCore</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/208945">208945</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-21 02:04:01 -0800 (Mon, 21 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add URL::hostAndPort()
https://bugs.webkit.org/show_bug.cgi?id=164907
Reviewed by Alex Christensen.
As a convenient way of getting the host and port (if any) as a string.
* html/URLUtils.h:
(WebCore::URLUtils<T>::host): Use URL::hostAndPort().
* page/Location.cpp:
(WebCore::Location::host): Ditto.
* platform/URL.cpp:
(WebCore::URL::hostAndPort): Return host:port or just host if there isn't a port.
* platform/URL.h:
* platform/network/CredentialStorage.cpp:
(WebCore::originStringFromURL): Use URL::hostAndPort().
* workers/WorkerLocation.cpp:
(WebCore::WorkerLocation::host): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlURLUtilsh">trunk/Source/WebCore/html/URLUtils.h</a></li>
<li><a href="#trunkSourceWebCorepageLocationcpp">trunk/Source/WebCore/page/Location.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkCredentialStoragecpp">trunk/Source/WebCore/platform/network/CredentialStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerLocationcpp">trunk/Source/WebCore/workers/WorkerLocation.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/ChangeLog 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Add URL::hostAndPort()
+ https://bugs.webkit.org/show_bug.cgi?id=164907
+
+ Reviewed by Alex Christensen.
+
+ As a convenient way of getting the host and port (if any) as a string.
+
+ * html/URLUtils.h:
+ (WebCore::URLUtils<T>::host): Use URL::hostAndPort().
+ * page/Location.cpp:
+ (WebCore::Location::host): Ditto.
+ * platform/URL.cpp:
+ (WebCore::URL::hostAndPort): Return host:port or just host if there isn't a port.
+ * platform/URL.h:
+ * platform/network/CredentialStorage.cpp:
+ (WebCore::originStringFromURL): Use URL::hostAndPort().
+ * workers/WorkerLocation.cpp:
+ (WebCore::WorkerLocation::host): Ditto.
+
</ins><span class="cx"> 2016-11-21 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC][OpenWebRTC] parse turns urls
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlURLUtilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/URLUtils.h (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/URLUtils.h 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/html/URLUtils.h 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -125,12 +125,7 @@
</span><span class="cx"> template <typename T>
</span><span class="cx"> String URLUtils<T>::host() const
</span><span class="cx"> {
</span><del>- const URL& url = href();
- if (url.hostEnd() == url.pathStart())
- return url.host();
- if (!url.port() || isDefaultPortForProtocol(url.port().value(), url.protocol()))
- return url.host();
- return url.host() + ':' + String::number(url.port().value());
</del><ins>+ return href().hostAndPort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This function does not allow leading spaces before the port number.
</span></span></pre></div>
<a id="trunkSourceWebCorepageLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Location.cpp (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Location.cpp 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/page/Location.cpp 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx">
</span><span class="cx"> // Note: this is the IE spec. The NS spec swaps the two, it says
</span><span class="cx"> // "The hostname property is the concatenation of the host and port properties, separated by a colon."
</span><del>- const URL& url = this->url();
- return url.port() ? url.host() + ":" + String::number(url.port().value()) : url.host();
</del><ins>+ return url().hostAndPort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String Location::hostname() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -730,6 +730,13 @@
</span><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String URL::hostAndPort() const
+{
+ if (auto port = this->port())
+ return host() + ':' + String::number(port.value());
+ return host();
+}
+
</ins><span class="cx"> String URL::user() const
</span><span class="cx"> {
</span><span class="cx"> return decodeURLEscapeSequences(m_string.substring(m_userStart, m_userEnd - m_userStart));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/platform/URL.h 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx"> WEBCORE_EXPORT StringView protocol() const;
</span><span class="cx"> WEBCORE_EXPORT String host() const;
</span><span class="cx"> WEBCORE_EXPORT Optional<uint16_t> port() const;
</span><ins>+ WEBCORE_EXPORT String hostAndPort() const;
</ins><span class="cx"> WEBCORE_EXPORT String user() const;
</span><span class="cx"> WEBCORE_EXPORT String pass() const;
</span><span class="cx"> WEBCORE_EXPORT String path() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkCredentialStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/CredentialStorage.cpp (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/CredentialStorage.cpp 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/platform/network/CredentialStorage.cpp 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -42,10 +42,7 @@
</span><span class="cx">
</span><span class="cx"> static String originStringFromURL(const URL& url)
</span><span class="cx"> {
</span><del>- if (url.port())
- return makeString(url.protocol(), "://", url.host(), ':', String::number(url.port().value()), '/');
-
- return makeString(url.protocol(), "://", url.host(), '/');
</del><ins>+ return makeString(url.protocol(), "://", url.hostAndPort(), '/');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String protectionSpaceMapKeyFromURL(const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerLocation.cpp (208944 => 208945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLocation.cpp 2016-11-21 09:41:29 UTC (rev 208944)
+++ trunk/Source/WebCore/workers/WorkerLocation.cpp 2016-11-21 10:04:01 UTC (rev 208945)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> String WorkerLocation::host() const
</span><span class="cx"> {
</span><del>- return m_url.port() ? m_url.host() + ":" + String::number(m_url.port().value()) : m_url.host();
</del><ins>+ return m_url.hostAndPort();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WorkerLocation::hostname() const
</span></span></pre>
</div>
</div>
</body>
</html>