<!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>[205813] trunk</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/205813">205813</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 11:10:24 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix more URLParser quirks
https://bugs.webkit.org/show_bug.cgi?id=161834
Reviewed by Brady Eidson.
Source/WebCore:
Added new API tests.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
Skip some tabs and newlines. The spec says to remove them before processing the String,
but to reduce allocations I am skipping them whenever we increment an iterator.
Fix a few other quirks to be more web platform conformant.
Tools:
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):</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="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLParsercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205812 => 205813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-12 18:06:59 UTC (rev 205812)
+++ trunk/Source/WebCore/ChangeLog 2016-09-12 18:10:24 UTC (rev 205813)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-12 Alex Christensen <achristensen@webkit.org>
+
+ Fix more URLParser quirks
+ https://bugs.webkit.org/show_bug.cgi?id=161834
+
+ Reviewed by Brady Eidson.
+
+ Added new API tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ Skip some tabs and newlines. The spec says to remove them before processing the String,
+ but to reduce allocations I am skipping them whenever we increment an iterator.
+ Fix a few other quirks to be more web platform conformant.
+
</ins><span class="cx"> 2016-09-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Optimize URLParser performance
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205812 => 205813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-12 18:06:59 UTC (rev 205812)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-12 18:10:24 UTC (rev 205813)
</span><span class="lines">@@ -559,11 +559,13 @@
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><span class="cx"> auto maybeSlash = c;
</span><span class="cx"> ++maybeSlash;
</span><ins>+ while (maybeSlash != end && isTabOrNewline(*maybeSlash))
+ ++maybeSlash;
</ins><span class="cx"> if (maybeSlash != end && *maybeSlash == '/') {
</span><span class="cx"> m_buffer.append('/');
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</span><span class="cx"> state = State::PathOrAuthority;
</span><del>- ++c;
</del><ins>+ c = maybeSlash;
</ins><span class="cx"> ASSERT(*c == '/');
</span><span class="cx"> } else {
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart;
</span><span class="lines">@@ -677,13 +679,13 @@
</span><span class="cx"> case State::SpecialAuthoritySlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthoritySlashes");
</span><span class="cx"> m_buffer.append("//");
</span><del>- if (*c == '/') {
</del><ins>+ if (*c == '/' || *c == '\\') {
</ins><span class="cx"> ++c;
</span><span class="cx"> while (c != end && isTabOrNewline(*c))
</span><span class="cx"> ++c;
</span><span class="cx"> if (c == end)
</span><span class="cx"> return failure(input);
</span><del>- if (*c == '/')
</del><ins>+ if (*c == '/' || *c == '\\')
</ins><span class="cx"> ++c;
</span><span class="cx"> }
</span><span class="cx"> state = State::SpecialAuthorityIgnoreSlashes;
</span><span class="lines">@@ -925,7 +927,7 @@
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="cx"> state = State::Fragment;
</span><span class="cx"> } else {
</span><del>- m_buffer.append(*c);
</del><ins>+ utf8PercentEncode(*c, m_buffer, isInSimpleEncodeSet);
</ins><span class="cx"> ++c;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205812 => 205813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-12 18:06:59 UTC (rev 205812)
+++ trunk/Tools/ChangeLog 2016-09-12 18:10:24 UTC (rev 205813)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-12 Alex Christensen <achristensen@webkit.org>
+
+ Fix more URLParser quirks
+ https://bugs.webkit.org/show_bug.cgi?id=161834
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-09-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Optimize URLParser performance
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205812 => 205813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-12 18:06:59 UTC (rev 205812)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-12 18:10:24 UTC (rev 205813)
</span><span class="lines">@@ -272,6 +272,10 @@
</span><span class="cx"> checkRelativeURL("http:\\\\foo.com/", "http://example.org/foo/bar", {"http", "", "", "foo.com", 0, "/", "", "", "http://foo.com/"});
</span><span class="cx"> checkRelativeURL("http:\\\\foo.com", "http://example.org/foo/bar", {"http", "", "", "foo.com", 0, "/", "", "", "http://foo.com/"});
</span><span class="cx"> checkRelativeURL("http://ExAmPlE.CoM", "http://other.com", {"http", "", "", "example.com", 0, "/", "", "", "http://example.com/"});
</span><ins>+
+ // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
+ // but it is included in the web platform tests.
+ checkRelativeURL("http:\\\\host\\foo", "about:blank", {"http", "", "", "host", 0, "/foo", "", "", "http://host/foo"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
</span><span class="lines">@@ -579,4 +583,14 @@
</span><span class="cx"> shouldFail("?i", "sc:sd/sd");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// These are in the spec but not in the web platform tests.
+TEST_F(URLParserTest, AdditionalTests)
+{
+ checkURL("about:\a\aabc", {"about", "", "", "", 0, "%07%07abc", "", "", "about:%07%07abc"});
+ checkURL("notspecial:\t\t\n\t", {"notspecial", "", "", "", 0, "", "", "", "notspecial:"});
+ checkURLDifferences("notspecial\t\t\n\t:\t\t\n\t/\t\t\n\t/\t\t\n\thost",
+ {"notspecial", "", "", "host", 0, "/", "", "", "notspecial://host/"},
+ {"notspecial", "", "", "host", 0, "", "", "", "notspecial://host"});
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>