<!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>[213818] 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/213818">213818</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 03:58:44 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213469">r213469</a> - Fix URLs relative to file URLs with paths beginning with Windows drive letters
https://bugs.webkit.org/show_bug.cgi?id=169178
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:
Windows drives in file URLs can begin with windows drive letters, such as file:///C:/
which should not be removed when making other URLs relative to them.
See https://url.spec.whatwg.org/#file-slash-state
Covered by new API tests and newly passing web-platform-tests.
* platform/URLParser.cpp:
(WebCore::URLParser::copyBaseWindowsDriveLetter):
(WebCore::URLParser::copyASCIIStringUntil):
(WebCore::URLParser::parse):
* platform/URLParser.h:
Tools:
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::TEST_F):
LayoutTests:
* fast/url/relative-win-expected.txt:
Some tests pass now. localhost should indeed be removed according to the latest spec.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfasturlrelativewinexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/url/relative-win-expected.txt</a></li>
<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="#releasesWebKitGTKwebkit216SourceWebCoreplatformURLParserh">releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.h</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="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
+ Fix URLs relative to file URLs with paths beginning with Windows drive letters
+ https://bugs.webkit.org/show_bug.cgi?id=169178
+
+ Reviewed by Tim Horton.
+
+ * fast/url/relative-win-expected.txt:
+ Some tests pass now. localhost should indeed be removed according to the latest spec.
+
</ins><span class="cx"> 2017-03-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Stretch should grow and shrink items to fit its grid area
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfasturlrelativewinexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/url/relative-win-expected.txt (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/url/relative-win-expected.txt 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/url/relative-win-expected.txt 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PASS canonicalize('http://host/') is 'http://host/'
</span><span class="cx"> PASS canonicalize('bar') is 'file:///C:/bar'
</span><span class="cx"> PASS canonicalize('../../../bar.html') is 'file:///C:/bar.html'
</span><del>-FAIL canonicalize('/../bar.html') should be file:///C:/bar.html. Was file:///bar.html.
</del><ins>+PASS canonicalize('/../bar.html') is 'file:///C:/bar.html'
</ins><span class="cx"> FAIL canonicalize('\\\\another\\path') should be . Was http://another/path.
</span><span class="cx"> FAIL canonicalize('//c:/foo') should be file:///C:/foo. Was file:///c:/foo.
</span><span class="cx"> FAIL canonicalize('//localhost/c:/foo') should be file:///C:/foo. Was file:///c:/foo.
</span><span class="lines">@@ -14,9 +14,9 @@
</span><span class="cx"> FAIL canonicalize('c:/foo') should be . Was c:/foo.
</span><span class="cx"> FAIL canonicalize('c:\\foo') should be . Was c:\foo.
</span><span class="cx"> FAIL canonicalize('/z:/bar') should be file:///Z:/bar. Was file:///z:/bar.
</span><del>-FAIL canonicalize('/bar') should be file:///C:/bar. Was file:///bar.
-FAIL canonicalize('/bar') should be file://localhost/C:/bar. Was file:///bar.
-FAIL canonicalize('/bar') should be file:///C:/bar. Was file:///bar.
</del><ins>+PASS canonicalize('/bar') is 'file:///C:/bar'
+FAIL canonicalize('/bar') should be file://localhost/C:/bar. Was file:///C:/bar.
+PASS canonicalize('/bar') is 'file:///C:/bar'
</ins><span class="cx"> PASS canonicalize('//somehost/path') is 'file://somehost/path'
</span><span class="cx"> FAIL canonicalize('/\\//somehost/path') should be file://somehost/path. Was file:////somehost/path.
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/ChangeLog 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
+ Fix URLs relative to file URLs with paths beginning with Windows drive letters
+ https://bugs.webkit.org/show_bug.cgi?id=169178
+
+ 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-02-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Non-special relative URLs should not ignore extra slashes
</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 (213817 => 213818)</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 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-expected.txt 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> PASS Parsing: <pix/submit.gif> against <file:///C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/anchor.html>
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><del>-FAIL Parsing: </> against <file:///C:/a/b> assert_equals: href expected "file:///C:/" but got "file:///"
</del><ins>+PASS Parsing: </> against <file:///C:/a/b>
</ins><span class="cx"> FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</span><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</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 (213817 => 213818)</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 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/a-element-xhtml-expected.txt 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> PASS Parsing: <pix/submit.gif> against <file:///C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/anchor.html>
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><del>-FAIL Parsing: </> against <file:///C:/a/b> assert_equals: href expected "file:///C:/" but got "file:///"
</del><ins>+PASS Parsing: </> against <file:///C:/a/b>
</ins><span class="cx"> FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</span><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</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 (213817 => 213818)</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 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/web-platform-tests/url/url-constructor-expected.txt 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> PASS Parsing: <pix/submit.gif> against <file:///C:/Users/Domenic/Dropbox/GitHub/tmpvar/jsdom/test/level2/html/files/anchor.html>
</span><span class="cx"> PASS Parsing: <..> against <file:///C:/>
</span><span class="cx"> PASS Parsing: <..> against <file:///>
</span><del>-FAIL Parsing: </> against <file:///C:/a/b> assert_equals: href expected "file:///C:/" but got "file:///"
</del><ins>+PASS Parsing: </> against <file:///C:/a/b>
</ins><span class="cx"> FAIL Parsing: <//d:> against <file:///C:/a/b> assert_equals: href expected "file:///d:" but got "file://d/"
</span><span class="cx"> PASS Parsing: <//d:/..> against <file:///C:/a/b>
</span><span class="cx"> PASS Parsing: <..> against <file:///ab:/>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
+ Fix URLs relative to file URLs with paths beginning with Windows drive letters
+ https://bugs.webkit.org/show_bug.cgi?id=169178
+
+ Reviewed by Tim Horton.
+
+ Windows drives in file URLs can begin with windows drive letters, such as file:///C:/
+ which should not be removed when making other URLs relative to them.
+ See https://url.spec.whatwg.org/#file-slash-state
+
+ Covered by new API tests and newly passing web-platform-tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::copyBaseWindowsDriveLetter):
+ (WebCore::URLParser::copyASCIIStringUntil):
+ (WebCore::URLParser::parse):
+ * platform/URLParser.h:
+
</ins><span class="cx"> 2017-03-06 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Stretch should grow and shrink items to fit its grid area
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.cpp 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -487,6 +487,29 @@
</span><span class="cx"> advance(iterator);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool URLParser::copyBaseWindowsDriveLetter(const URL& base)
+{
+ if (base.protocolIs("file")) {
+ RELEASE_ASSERT(base.m_portEnd < base.m_string.length());
+ if (base.m_string.is8Bit()) {
+ const LChar* begin = base.m_string.characters8();
+ CodePointIterator<LChar> c(begin + base.m_portEnd + 1, begin + base.m_string.length());
+ if (isWindowsDriveLetter(c)) {
+ appendWindowsDriveLetter(c);
+ return true;
+ }
+ } else {
+ const UChar* begin = base.m_string.characters16();
+ CodePointIterator<UChar> c(begin + base.m_portEnd + 1, begin + base.m_string.length());
+ if (isWindowsDriveLetter(c)) {
+ appendWindowsDriveLetter(c);
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
</ins><span class="cx"> template<typename CharacterType>
</span><span class="cx"> bool URLParser::shouldCopyFileURL(CodePointIterator<CharacterType> iterator)
</span><span class="cx"> {
</span><span class="lines">@@ -814,9 +837,9 @@
</span><span class="cx"> if (string.isNull())
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(m_asciiBuffer.isEmpty());
</span><del>- if (string.is8Bit()) {
</del><ins>+ if (string.is8Bit())
</ins><span class="cx"> appendToASCIIBuffer(string.characters8(), length);
</span><del>- } else {
</del><ins>+ else {
</ins><span class="cx"> const UChar* characters = string.characters16();
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><span class="cx"> UChar c = characters[i];
</span><span class="lines">@@ -1602,19 +1625,6 @@
</span><span class="cx"> state = State::FileHost;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- if (base.isValid() && base.protocolIs("file")) {
- // FIXME: This String copy is unnecessary.
- String basePath = base.path();
- if (basePath.length() >= 2) {
- bool windowsQuirk = basePath.is8Bit()
- ? isWindowsDriveLetter(CodePointIterator<LChar>(basePath.characters8(), basePath.characters8() + basePath.length()))
- : isWindowsDriveLetter(CodePointIterator<UChar>(basePath.characters16(), basePath.characters16() + basePath.length()));
- if (windowsQuirk) {
- appendToASCIIBuffer(basePath[0]);
- appendToASCIIBuffer(basePath[1]);
- }
- }
- }
</del><span class="cx"> syntaxViolation(c);
</span><span class="cx"> appendToASCIIBuffer("//", 2);
</span><span class="cx"> m_url.m_userStart = currentPosition(c) - 1;
</span><span class="lines">@@ -1622,9 +1632,14 @@
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_hostEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><del>- m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
- if (isWindowsDriveLetter(c))
</del><ins>+ if (isWindowsDriveLetter(c)) {
</ins><span class="cx"> appendWindowsDriveLetter(c);
</span><ins>+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
+ } else if (copyBaseWindowsDriveLetter(base)) {
+ appendToASCIIBuffer('/');
+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 4;
+ } else
+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</ins><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> case State::FileHost:
</span><span class="lines">@@ -1931,7 +1946,11 @@
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_hostEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_portEnd = m_url.m_userStart;
</span><del>- m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</del><ins>+ if (copyBaseWindowsDriveLetter(base)) {
+ appendToASCIIBuffer('/');
+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 4;
+ } else
+ m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</ins><span class="cx"> m_url.m_pathEnd = m_url.m_pathAfterLastSlash;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathAfterLastSlash;
</span><span class="cx"> m_url.m_fragmentEnd = m_url.m_pathAfterLastSlash;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.h (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.h 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/URLParser.h 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> void appendToASCIIBuffer(const LChar* characters, size_t size) { appendToASCIIBuffer(reinterpret_cast<const char*>(characters), size); }
</span><span class="cx"> template<typename CharacterType> void encodeQuery(const Vector<UChar>& source, const TextEncoding&, CodePointIterator<CharacterType>);
</span><span class="cx"> void copyASCIIStringUntil(const String&, size_t length);
</span><ins>+ bool copyBaseWindowsDriveLetter(const URL&);
</ins><span class="cx"> StringView parsedDataView(size_t start, size_t length);
</span><span class="cx"> UChar parsedDataView(size_t position);
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Tools/ChangeLog (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Tools/ChangeLog 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/Tools/ChangeLog 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
+ Fix URLs relative to file URLs with paths beginning with Windows drive letters
+ https://bugs.webkit.org/show_bug.cgi?id=169178
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-03-03 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [URLParser] Fix file: as a relative file URL
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216ToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (213817 => 213818)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-03-13 10:48:13 UTC (rev 213817)
+++ releases/WebKitGTK/webkit-2.16/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2017-03-13 10:58:44 UTC (rev 213818)
</span><span class="lines">@@ -580,6 +580,10 @@
</span><span class="cx"> checkRelativeURL("http://something?", "file:////var//containers//stuff/", {"http", "", "", "something", 0, "/", "", "", "http://something/?"}, TestTabs::No);
</span><span class="cx"> checkRelativeURL("http://something#", "file:////var//containers//stuff/", {"http", "", "", "something", 0, "/", "", "", "http://something/#"}, TestTabs::No);
</span><span class="cx"> checkRelativeURL("file:", "file:///path?query#fragment", {"file", "", "", "", 0, "/path", "query", "", "file:///path?query"});
</span><ins>+ checkRelativeURL("/", "file:///C:/a/b", {"file", "", "", "", 0, "/C:/", "", "", "file:///C:/"});
+ checkRelativeURL("/abc", "file:///C:/a/b", {"file", "", "", "", 0, "/C:/abc", "", "", "file:///C:/abc"});
+ checkRelativeURL("/abc", "file:///C:", {"file", "", "", "", 0, "/C:/abc", "", "", "file:///C:/abc"});
+ checkRelativeURL("/abc", "file:///", {"file", "", "", "", 0, "/abc", "", "", "file:///abc"});
</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>