<!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>[205922] 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/205922">205922</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 12:34:53 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser: Add fast path for hosts containing no non-ASCII or percent characters
https://bugs.webkit.org/show_bug.cgi?id=161970
Reviewed by Daniel Bates.
Covered by existing tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
(WebCore::URLParser::parseHost):
* platform/URLParser.h:
When parsing the host of a URL, if it contains non-ASCII characters or percent-encoded values,
we need to do additional encoding. Many URLs, including all already-parsed URLs, do not have
such characters in their host, and therefore do not need the additional encoding. Skipping
the additional encoding significantly speeds up my URL parsing benchmark.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParsercpp">trunk/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205921 => 205922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-14 18:51:26 UTC (rev 205921)
+++ trunk/Source/WebCore/ChangeLog 2016-09-14 19:34:53 UTC (rev 205922)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-14 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: Add fast path for hosts containing no non-ASCII or percent characters
+ https://bugs.webkit.org/show_bug.cgi?id=161970
+
+ Reviewed by Daniel Bates.
+
+ Covered by existing tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ (WebCore::URLParser::parseHost):
+ * platform/URLParser.h:
+ When parsing the host of a URL, if it contains non-ASCII characters or percent-encoded values,
+ we need to do additional encoding. Many URLs, including all already-parsed URLs, do not have
+ such characters in their host, and therefore do not need the additional encoding. Skipping
+ the additional encoding significantly speeds up my URL parsing benchmark.
+
</ins><span class="cx"> 2016-09-14 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ShowRenderTree should take position offset into account when printing inflow positioned renderers.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205921 => 205922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-14 18:51:26 UTC (rev 205921)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-14 19:34:53 UTC (rev 205922)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> template<typename CharacterType> static bool isInDefaultEncodeSet(CharacterType character) { return isInSimpleEncodeSet(character) || character == 0x0020 || character == '"' || character == '#' || character == '<' || character == '>' || character == '?' || character == '`' || character == '{' || character == '}'; }
</span><span class="cx"> template<typename CharacterType> static bool isInUserInfoEncodeSet(CharacterType character) { return isInDefaultEncodeSet(character) || character == '/' || character == ':' || character == ';' || character == '=' || character == '@' || character == '[' || character == '\\' || character == ']' || character == '^' || character == '|'; }
</span><span class="cx"> template<typename CharacterType> static bool isInvalidDomainCharacter(CharacterType character) { return character == 0x0000 || character == 0x0009 || character == 0x000A || character == 0x000D || character == 0x0020 || character == '#' || character == '%' || character == '/' || character == ':' || character == '?' || character == '@' || character == '[' || character == '\\' || character == ']'; }
</span><ins>+template<typename CharacterType> static bool isPercentOrNonASCII(CharacterType character) { return !isASCII(character) || character == '%'; }
</ins><span class="cx">
</span><span class="cx"> static bool isWindowsDriveLetter(StringView::CodePoints::Iterator iterator, const StringView::CodePoints::Iterator& end)
</span><span class="cx"> {
</span><span class="lines">@@ -733,6 +734,7 @@
</span><span class="cx"> ++c;
</span><span class="cx"> authorityOrHostBegin = c;
</span><span class="cx"> state = State::Host;
</span><ins>+ m_hostHasPercentOrNonASCII = false;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> bool isSlash = *c == '/' || (m_urlIsSpecial && *c == '\\');
</span><span class="lines">@@ -748,6 +750,8 @@
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ if (isPercentOrNonASCII(*c))
+ m_hostHasPercentOrNonASCII = true;
</ins><span class="cx"> ++c;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -759,6 +763,8 @@
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ if (isPercentOrNonASCII(*c))
+ m_hostHasPercentOrNonASCII = true;
</ins><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> case State::File:
</span><span class="lines">@@ -889,6 +895,8 @@
</span><span class="cx"> state = State::PathStart;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ if (isPercentOrNonASCII(*c))
+ m_hostHasPercentOrNonASCII = true;
</ins><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> case State::PathStart:
</span><span class="lines">@@ -1558,6 +1566,40 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (!m_hostHasPercentOrNonASCII) {
+ auto hostIterator = iterator;
+ for (; iterator != end; ++iterator) {
+ if (isTabOrNewline(*iterator))
+ continue;
+ if (*iterator == ':')
+ break;
+ }
+ if (auto address = parseIPv4Host(hostIterator, iterator)) {
+ serializeIPv4(address.value(), m_buffer);
+ m_url.m_hostEnd = m_buffer.length();
+ if (iterator == end) {
+ m_url.m_portEnd = m_buffer.length();
+ return true;
+ }
+ ++iterator;
+ return parsePort(iterator, end);
+ }
+ for (; hostIterator != iterator; ++hostIterator) {
+ if (!isTabOrNewline(*hostIterator))
+ m_buffer.append(toASCIILower(*hostIterator));
+ }
+ m_url.m_hostEnd = m_buffer.length();
+ if (hostIterator != end) {
+ ASSERT(*hostIterator == ':');
+ ++hostIterator;
+ while (hostIterator != end && isTabOrNewline(*hostIterator))
+ ++hostIterator;
+ return parsePort(hostIterator, end);
+ }
+ m_url.m_portEnd = m_buffer.length();
+ return true;
+ }
</ins><span class="cx">
</span><span class="cx"> // FIXME: We probably don't need to make so many buffers and String copies.
</span><span class="cx"> StringBuilder utf8Encoded;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (205921 => 205922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-09-14 18:51:26 UTC (rev 205921)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-09-14 19:34:53 UTC (rev 205922)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> URL m_url;
</span><span class="cx"> StringBuilder m_buffer;
</span><span class="cx"> bool m_urlIsSpecial { false };
</span><ins>+ bool m_hostHasPercentOrNonASCII { false };
</ins><span class="cx"> void parseAuthority(StringView::CodePoints::Iterator&, const StringView::CodePoints::Iterator& end);
</span><span class="cx"> bool parseHost(StringView::CodePoints::Iterator&, const StringView::CodePoints::Iterator& end);
</span><span class="cx"> bool parsePort(StringView::CodePoints::Iterator&, const StringView::CodePoints::Iterator& end);
</span></span></pre>
</div>
</div>
</body>
</html>