<!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>[162555] 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/162555">162555</a></dd>
<dt>Author</dt> <dd>jochen@chromium.org</dd>
<dt>Date</dt> <dd>2014-01-22 14:17:33 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add protocolIsInHTTPFamily for strings and use it where appropriate
https://bugs.webkit.org/show_bug.cgi?id=127336
Reviewed by Alexey Proskuryakov.
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::parseAttribute):
* page/ContentSecurityPolicy.cpp:
(WebCore::CSPSource::schemeMatches):
* page/SecurityPolicy.cpp:
(WebCore::SecurityPolicy::generateReferrerHeader):
* platform/URL.cpp:
(WebCore::protocolIsInHTTPFamily):
* platform/URL.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityPolicycpp">trunk/Source/WebCore/page/SecurityPolicy.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-22 Jochen Eisinger <jochen@chromium.org>
+
+ Add protocolIsInHTTPFamily for strings and use it where appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=127336
+
+ Reviewed by Alexey Proskuryakov.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::parseAttribute):
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::CSPSource::schemeMatches):
+ * page/SecurityPolicy.cpp:
+ (WebCore::SecurityPolicy::generateReferrerHeader):
+ * platform/URL.cpp:
+ (WebCore::protocolIsInHTTPFamily):
+ * platform/URL.h:
+
</ins><span class="cx"> 2014-01-22 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel Layout: SimpleLineLayout needs more position rounding to match InlineFlowBox layout.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> if (isLink()) {
</span><span class="cx"> String parsedURL = stripLeadingAndTrailingHTMLSpaces(value);
</span><span class="cx"> if (document().isDNSPrefetchEnabled()) {
</span><del>- if (protocolIs(parsedURL, "http") || protocolIs(parsedURL, "https") || parsedURL.startsWith("//"))
</del><ins>+ if (protocolIsInHTTPFamily(parsedURL) || parsedURL.startsWith("//"))
</ins><span class="cx"> prefetchDNS(document().completeURL(parsedURL).host());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> String protectedResourceScheme(m_policy->securityOrigin()->protocol());
</span><span class="cx"> #if ENABLE(CSP_NEXT)
</span><span class="cx"> if (equalIgnoringCase("http", protectedResourceScheme))
</span><del>- return url.protocolIs("http") || url.protocolIs("https");
</del><ins>+ return url.protocolIsInHTTPFamily();
</ins><span class="cx"> #endif
</span><span class="cx"> return equalIgnoringCase(url.protocol(), protectedResourceScheme);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityPolicy.cpp (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityPolicy.cpp 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/page/SecurityPolicy.cpp 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (referrer.isEmpty())
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- if (!protocolIs(referrer, "http") && !protocolIs(referrer, "https"))
</del><ins>+ if (!protocolIsInHTTPFamily(referrer))
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> switch (referrerPolicy) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/platform/URL.cpp 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -1775,6 +1775,16 @@
</span><span class="cx"> return protocolIs(url, "javascript");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool protocolIsInHTTPFamily(const String& url)
+{
+ // Do the comparison without making a new string object.
+ return isLetterMatchIgnoringCase(url[0], 'h')
+ && isLetterMatchIgnoringCase(url[1], 't')
+ && isLetterMatchIgnoringCase(url[2], 't')
+ && isLetterMatchIgnoringCase(url[3], 'p')
+ && (url[4] == ':' || (isLetterMatchIgnoringCase(url[4], 's') && url[5] == ':'));
+}
+
</ins><span class="cx"> const URL& blankURL()
</span><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(URL, staticBlankURL, (ParsedURLString, "about:blank"));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (162554 => 162555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2014-01-22 22:16:37 UTC (rev 162554)
+++ trunk/Source/WebCore/platform/URL.h 2014-01-22 22:17:33 UTC (rev 162555)
</span><span class="lines">@@ -225,6 +225,7 @@
</span><span class="cx">
</span><span class="cx"> bool protocolIs(const String& url, const char* protocol);
</span><span class="cx"> bool protocolIsJavaScript(const String& url);
</span><ins>+bool protocolIsInHTTPFamily(const String& url);
</ins><span class="cx">
</span><span class="cx"> bool isDefaultPortForProtocol(unsigned short port, const String& protocol);
</span><span class="cx"> bool portAllowed(const URL&); // Blacklist ports that should never be used for Web resources.
</span></span></pre>
</div>
</div>
</body>
</html>