<!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>[213829] releases/WebKitGTK/webkit-2.16</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/213829">213829</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 04:40:37 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213546">r213546</a> - [URLParser] Fix file URLs that are just file:// and a Windows drive letter
https://bugs.webkit.org/show_bug.cgi?id=169242
Patch by Alex Christensen <achristensen@webkit.org> on 2017-03-07
Reviewed by Tim Horton.
LayoutTests/imported/w3c:
* web-platform-tests/url/a-element-expected.txt:
* web-platform-tests/url/a-element-xhtml-expected.txt:
* web-platform-tests/url/url-constructor-expected.txt:
Source/WebCore:
This is specified in https://url.spec.whatwg.org/#file-host-state and tested by a newly-passing
web platform test. I added the check for the windows drive quirk in the FileHost state of the
parser but I forgot it when FileHost is the terminal state.
* platform/URLParser.cpp:
(WebCore::URLParser::parse):
Tools:
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementxhtmlexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlurlconstructorexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreplatformURLParsercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216ToolsChangeLog">releases/WebKitGTK/webkit-2.16/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216ToolsTestWebKitAPITestsWebCoreURLParsercpp">releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-07 Alex Christensen <achristensen@webkit.org>
+
+ [URLParser] Fix file URLs that are just file:// and a Windows drive letter
+ https://bugs.webkit.org/show_bug.cgi?id=169242
+
+ Reviewed by Tim Horton.
+
+ * web-platform-tests/url/a-element-expected.txt:
+ * web-platform-tests/url/a-element-xhtml-expected.txt:
+ * web-platform-tests/url/url-constructor-expected.txt:
+
</ins><span class="cx"> 2017-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align initEvent / initCustomEvent / initMessageEvent with the latest specification
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><span class="cx"> PASS Parsing: </> against <file:///C:/a/b>
</span><del>-FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</del><ins>+PASS Parsing: <//d:> against <file:///C:/a/b>
</ins><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///1:/>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlaelementxhtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><span class="cx"> PASS Parsing: </> against <file:///C:/a/b>
</span><del>-FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</del><ins>+PASS Parsing: <//d:> against <file:///C:/a/b>
</ins><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///1:/>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cwebplatformtestsurlurlconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><span class="cx"> PASS Parsing: </> against <file:///C:/a/b>
</span><del>-FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</del><ins>+PASS Parsing: <//d:> against <file:///C:/a/b>
</ins><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///1:/>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-07 Alex Christensen <achristensen@webkit.org>
+
+ [URLParser] Fix file URLs that are just file:// and a Windows drive letter
+ https://bugs.webkit.org/show_bug.cgi?id=169242
+
+ Reviewed by Tim Horton.
+
+ This is specified in https://url.spec.whatwg.org/#file-host-state and tested by a newly-passing
+ web platform test. I added the check for the windows drive quirk in the FileHost state of the
+ parser but I forgot it when FileHost is the terminal state.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2017-03-07 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -1957,6 +1957,18 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::FileHost:
</span><span class="cx"> LOG_FINAL_STATE("FileHost");
</span><ins>+ if (takesTwoAdvancesUntilEnd(CodePointIterator<CharacterType>(authorityOrHostBegin, c))
+ && isWindowsDriveLetter(authorityOrHostBegin)) {
+ syntaxViolation(authorityOrHostBegin);
+ appendToASCIIBuffer('/');
+ appendWindowsDriveLetter(authorityOrHostBegin);
+ m_url.m_pathAfterLastSlash = currentPosition(c);
+ m_url.m_pathEnd = m_url.m_pathAfterLastSlash;
+ m_url.m_queryEnd = m_url.m_pathAfterLastSlash;
+ m_url.m_fragmentEnd = m_url.m_pathAfterLastSlash;
+ break;
+ }
+
</ins><span class="cx"> if (authorityOrHostBegin == c) {
</span><span class="cx"> syntaxViolation(c);
</span><span class="cx"> appendToASCIIBuffer('/');
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Tools/ChangeLog (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Tools/ChangeLog 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/Tools/ChangeLog 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-07 Alex Christensen <achristensen@webkit.org>
+
+ [URLParser] Fix file URLs that are just file:// and a Windows drive letter
+ https://bugs.webkit.org/show_bug.cgi?id=169242
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-03-06 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Mark WTF_Lock.ContendedLongSection and WTF_WordLock.ContendedLongSection as slow.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216ToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (213828 => 213829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-03-13 11:39:12 UTC (rev 213828)
+++ releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-03-13 11:40:37 UTC (rev 213829)
</span><span class="lines">@@ -584,6 +584,9 @@
</span><span class="cx"> checkRelativeURL("/abc", "file:///C:/a/b", {"file", "", "", "", 0, "/C:/abc", "", "", "file:///C:/abc"});
</span><span class="cx"> checkRelativeURL("/abc", "file:///C:", {"file", "", "", "", 0, "/C:/abc", "", "", "file:///C:/abc"});
</span><span class="cx"> checkRelativeURL("/abc", "file:///", {"file", "", "", "", 0, "/abc", "", "", "file:///abc"});
</span><ins>+ checkRelativeURL("//d:", "file:///C:/a/b", {"file", "", "", "", 0, "/d:", "", "", "file:///d:"}, TestTabs::No);
+ checkRelativeURL("//d|", "file:///C:/a/b", {"file", "", "", "", 0, "/d:", "", "", "file:///d:"}, TestTabs::No);
+ checkRelativeURL("//A|", "file:///C:/a/b", {"file", "", "", "", 0, "/A:", "", "", "file:///A:"}, TestTabs::No);
</ins><span class="cx">
</span><span class="cx"> // The checking of slashes in SpecialAuthoritySlashes needed to get this to pass contradicts what is in the spec,
</span><span class="cx"> // but it is included in the web platform tests.
</span></span></pre>
</div>
</div>
</body>
</html>