<!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>[205782] 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/205782">205782</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-09 19:06:39 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser: Keep track of cannot-be-a-base-url according to spec
https://bugs.webkit.org/show_bug.cgi?id=161830
Reviewed by Tim Horton.
Source/WebCore:
Covered by new API tests.
* platform/URL.cpp:
(WebCore::URL::invalidate):
* platform/URL.h:
Add a boolean required by the spec.
This will not add to sizeof(URL) because we already have some bit fields.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
(WebCore::URLParser::allValuesEqual):
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="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</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 (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Source/WebCore/ChangeLog 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-09 Alex Christensen <achristensen@webkit.org>
+
+ URLParser: Keep track of cannot-be-a-base-url according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=161830
+
+ Reviewed by Tim Horton.
+
+ Covered by new API tests.
+
+ * platform/URL.cpp:
+ (WebCore::URL::invalidate):
+ * platform/URL.h:
+ Add a boolean required by the spec.
+ This will not add to sizeof(URL) because we already have some bit fields.
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+ (WebCore::URLParser::allValuesEqual):
+
</ins><span class="cx"> 2016-09-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205771.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -425,6 +425,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_isValid = false;
</span><span class="cx"> m_protocolIsInHTTPFamily = false;
</span><ins>+ m_cannotBeABaseURL = false;
</ins><span class="cx"> m_schemeEnd = 0;
</span><span class="cx"> m_userStart = 0;
</span><span class="cx"> m_userEnd = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Source/WebCore/platform/URL.h 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -218,6 +218,7 @@
</span><span class="cx"> String m_string;
</span><span class="cx"> bool m_isValid : 1;
</span><span class="cx"> bool m_protocolIsInHTTPFamily : 1;
</span><ins>+ bool m_cannotBeABaseURL : 1;
</ins><span class="cx">
</span><span class="cx"> unsigned m_schemeEnd;
</span><span class="cx"> unsigned m_userStart;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -476,6 +476,7 @@
</span><span class="cx"> ASSERT(*c == '/');
</span><span class="cx"> } else {
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart;
</span><ins>+ m_url.m_cannotBeABaseURL = true;
</ins><span class="cx"> state = State::CannotBeABaseURLPath;
</span><span class="cx"> }
</span><span class="cx"> ++c;
</span><span class="lines">@@ -498,19 +499,21 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::NoScheme:
</span><span class="cx"> LOG_STATE("NoScheme");
</span><del>- if (base.isNull()) {
- if (*c == '#') {
- copyURLPartsUntil(base, URLPart::QueryEnd);
- state = State::Fragment;
- ++c;
- } else
- return failure(input);
- } else if (base.protocol() == "file") {
- copyURLPartsUntil(base, URLPart::SchemeEnd);
- m_buffer.append(':');
- state = State::File;
- } else
</del><ins>+ if (base.isNull() || (base.m_cannotBeABaseURL && *c != '#'))
+ return failure(input);
+ if (base.m_cannotBeABaseURL && *c == '#') {
+ copyURLPartsUntil(base, URLPart::QueryEnd);
+ state = State::Fragment;
+ ++c;
+ break;
+ }
+ if (base.protocol() != "file") {
</ins><span class="cx"> state = State::Relative;
</span><ins>+ break;
+ }
+ copyURLPartsUntil(base, URLPart::SchemeEnd);
+ m_buffer.append(':');
+ state = State::File;
</ins><span class="cx"> break;
</span><span class="cx"> case State::SpecialRelativeOrAuthority:
</span><span class="cx"> LOG_STATE("SpecialRelativeOrAuthority");
</span><span class="lines">@@ -1476,6 +1479,8 @@
</span><span class="cx">
</span><span class="cx"> bool URLParser::allValuesEqual(const URL& a, const URL& b)
</span><span class="cx"> {
</span><ins>+ // FIXME: m_cannotBeABaseURL is not compared because the old URL::parse did not use it,
+ // but once we get rid of URL::parse its value should be tested.
</ins><span class="cx"> LOG(URLParser, "%d %d %d %d %d %d %d %d %d %d %d %d %s\n%d %d %d %d %d %d %d %d %d %d %d %d %s",
</span><span class="cx"> a.m_isValid,
</span><span class="cx"> a.m_protocolIsInHTTPFamily,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Tools/ChangeLog 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-09-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ URLParser: Keep track of cannot-be-a-base-url according to spec
+ https://bugs.webkit.org/show_bug.cgi?id=161830
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
+2016-09-09 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Fix API tests after r205774.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161820
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205781 => 205782)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-10 01:08:23 UTC (rev 205781)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-10 02:06:39 UTC (rev 205782)
</span><span class="lines">@@ -563,6 +563,12 @@
</span><span class="cx"> shouldFail("http://:b@");
</span><span class="cx"> shouldFail("http://@");
</span><span class="cx"> shouldFail("http://[0:f::f:f:0:0]:abc");
</span><ins>+ shouldFail("../i", "sc:sd");
+ shouldFail("../i", "sc:sd/sd");
+ shouldFail("/i", "sc:sd");
+ shouldFail("/i", "sc:sd/sd");
+ shouldFail("?i", "sc:sd");
+ shouldFail("?i", "sc:sd/sd");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>