<!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>[206157] 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/206157">206157</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-20 11:27:37 -0700 (Tue, 20 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Windows file URL quirks in URLParser
https://bugs.webkit.org/show_bug.cgi?id=162303
Reviewed by Tim Horton.
Source/WebCore:
Windows file urls allow c:\ and c|\ to have the same meaning, but when serialized they should both be c:/.
This is now standardized to allow cross-platform uniform behavior of URLs.
Covered by new API tests and progress on web platform tests when URLParser is enabled.
* platform/URLParser.cpp:
(WebCore::incrementIteratorSkippingTabAndNewLine):
(WebCore::isWindowsDriveLetter):
(WebCore::checkWindowsDriveLetter):
(WebCore::shouldCopyFileURL):
(WebCore::URLParser::parseSerializedURL):
(WebCore::URLParser::parse):
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 (206156 => 206157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-20 18:24:41 UTC (rev 206156)
+++ trunk/Source/WebCore/ChangeLog 2016-09-20 18:27:37 UTC (rev 206157)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-20 Alex Christensen <achristensen@webkit.org>
+
+ Fix Windows file URL quirks in URLParser
+ https://bugs.webkit.org/show_bug.cgi?id=162303
+
+ Reviewed by Tim Horton.
+
+ Windows file urls allow c:\ and c|\ to have the same meaning, but when serialized they should both be c:/.
+ This is now standardized to allow cross-platform uniform behavior of URLs.
+
+ Covered by new API tests and progress on web platform tests when URLParser is enabled.
+
+ * platform/URLParser.cpp:
+ (WebCore::incrementIteratorSkippingTabAndNewLine):
+ (WebCore::isWindowsDriveLetter):
+ (WebCore::checkWindowsDriveLetter):
+ (WebCore::shouldCopyFileURL):
+ (WebCore::URLParser::parseSerializedURL):
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2016-09-20 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename FrameData to ImageFrame, move it to a separate file and use it for all ports
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206156 => 206157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-20 18:24:41 UTC (rev 206156)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-20 18:27:37 UTC (rev 206157)
</span><span class="lines">@@ -393,13 +393,21 @@
</span><span class="cx"> template<typename CharacterType> inline static bool isPercentOrNonASCII(CharacterType character) { return !isASCII(character) || character == '%'; }
</span><span class="cx"> template<typename CharacterType> inline static bool isSlashQuestionOrHash(CharacterType character) { return character <= '\\' && characterClassTable[character] & SlashQuestionOrHash; }
</span><span class="cx"> static bool shouldPercentEncodeQueryByte(uint8_t byte) { return characterClassTable[byte] & QueryPercent; }
</span><del>-
-template<typename CharacterType>
</del><ins>+
+template<bool serialized, typename CharacterType>
+void incrementIteratorSkippingTabAndNewLine(CodePointIterator<CharacterType>& iterator)
+{
+ ++iterator;
+ while (!serialized && !iterator.atEnd() && isTabOrNewline(*iterator))
+ ++iterator;
+}
+
+template<bool serialized, typename CharacterType>
</ins><span class="cx"> inline static bool isWindowsDriveLetter(CodePointIterator<CharacterType> iterator)
</span><span class="cx"> {
</span><span class="cx"> if (iterator.atEnd() || !isASCIIAlpha(*iterator))
</span><span class="cx"> return false;
</span><del>- ++iterator;
</del><ins>+ incrementIteratorSkippingTabAndNewLine<serialized>(iterator);
</ins><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return false;
</span><span class="cx"> return *iterator == ':' || *iterator == '|';
</span><span class="lines">@@ -412,17 +420,31 @@
</span><span class="cx"> return isASCIIAlpha(buffer[index]) && (buffer[index + 1] == ':' || buffer[index + 1] == '|');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename CharacterType>
</del><ins>+template<bool serialized, typename CharacterType>
+inline static void checkWindowsDriveLetter(CodePointIterator<CharacterType>& iterator, Vector<LChar>& asciiBuffer)
+{
+ if (isWindowsDriveLetter<serialized>(iterator)) {
+ asciiBuffer.reserveCapacity(asciiBuffer.size() + 2);
+ asciiBuffer.uncheckedAppend(*iterator);
+ incrementIteratorSkippingTabAndNewLine<serialized>(iterator);
+ ASSERT(!iterator.atEnd());
+ ASSERT(*iterator == ':' || *iterator == '|');
+ asciiBuffer.uncheckedAppend(':');
+ incrementIteratorSkippingTabAndNewLine<serialized>(iterator);
+ }
+}
+
+template<bool serialized, typename CharacterType>
</ins><span class="cx"> inline static bool shouldCopyFileURL(CodePointIterator<CharacterType> iterator)
</span><span class="cx"> {
</span><del>- if (isWindowsDriveLetter(iterator))
</del><ins>+ if (!isWindowsDriveLetter<serialized>(iterator))
</ins><span class="cx"> return true;
</span><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return false;
</span><del>- ++iterator;
</del><ins>+ incrementIteratorSkippingTabAndNewLine<serialized>(iterator);
</ins><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return true;
</span><del>- ++iterator;
</del><ins>+ incrementIteratorSkippingTabAndNewLine<serialized>(iterator);
</ins><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return true;
</span><span class="cx"> return !isSlashQuestionOrHash(*iterator);
</span><span class="lines">@@ -890,14 +912,6 @@
</span><span class="cx"> return parse<serialized>(input.characters8(), input.length(), { }, UTF8Encoding());
</span><span class="cx"> return parse<serialized>(input.characters16(), input.length(), { }, UTF8Encoding());
</span><span class="cx"> }
</span><del>-
-template<bool serialized, typename CharacterType>
-void incrementIteratorSkippingTabAndNewLine(CodePointIterator<CharacterType>& iterator)
-{
- ++iterator;
- while (!serialized && !iterator.atEnd() && isTabOrNewline(*iterator))
- ++iterator;
-}
</del><span class="cx">
</span><span class="cx"> template<bool serialized, typename CharacterType>
</span><span class="cx"> URL URLParser::parse(const CharacterType* input, const unsigned length, const URL& base, const TextEncoding& encoding)
</span><span class="lines">@@ -1204,7 +1218,7 @@
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- if (!base.isNull() && base.protocolIs("file") && shouldCopyFileURL(c))
</del><ins>+ if (!base.isNull() && base.protocolIs("file") && shouldCopyFileURL<serialized>(c))
</ins><span class="cx"> copyURLPartsUntil(base, URLPart::PathAfterLastSlash);
</span><span class="cx"> else {
</span><span class="cx"> m_asciiBuffer.append("///", 3);
</span><span class="lines">@@ -1214,6 +1228,7 @@
</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><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</span><ins>+ checkWindowsDriveLetter<serialized>(c, m_asciiBuffer);
</ins><span class="cx"> }
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="lines">@@ -1238,15 +1253,13 @@
</span><span class="cx"> String basePath = base.path();
</span><span class="cx"> if (basePath.length() >= 2) {
</span><span class="cx"> bool windowsQuirk = basePath.is8Bit()
</span><del>- ? isWindowsDriveLetter(CodePointIterator<LChar>(basePath.characters8(), basePath.characters8() + basePath.length()))
- : isWindowsDriveLetter(CodePointIterator<UChar>(basePath.characters16(), basePath.characters16() + basePath.length()));
</del><ins>+ ? isWindowsDriveLetter<serialized>(CodePointIterator<LChar>(basePath.characters8(), basePath.characters8() + basePath.length()))
+ : isWindowsDriveLetter<serialized>(CodePointIterator<UChar>(basePath.characters16(), basePath.characters16() + basePath.length()));
</ins><span class="cx"> if (windowsQuirk) {
</span><span class="cx"> m_asciiBuffer.append(basePath[0]);
</span><span class="cx"> m_asciiBuffer.append(basePath[1]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- state = State::Path;
- break;
</del><span class="cx"> }
</span><span class="cx"> m_asciiBuffer.append("//", 2);
</span><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="lines">@@ -1255,6 +1268,7 @@
</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><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_userStart + 1;
</span><ins>+ checkWindowsDriveLetter<serialized>(c, m_asciiBuffer);
</ins><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> case State::FileHost:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206156 => 206157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-20 18:24:41 UTC (rev 206156)
+++ trunk/Tools/ChangeLog 2016-09-20 18:27:37 UTC (rev 206157)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-20 Alex Christensen <achristensen@webkit.org>
+
+ Fix Windows file URL quirks in URLParser
+ https://bugs.webkit.org/show_bug.cgi?id=162303
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-09-20 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Make MarkedBlock state tracking support overlapped allocation and marking state
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206156 => 206157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-20 18:24:41 UTC (rev 206156)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-20 18:27:37 UTC (rev 206157)
</span><span class="lines">@@ -526,6 +526,21 @@
</span><span class="cx"> checkURLDifferences("http://123.234.12",
</span><span class="cx"> {"http", "", "", "123.234.0.12", 0, "/", "", "", "http://123.234.0.12/"},
</span><span class="cx"> {"http", "", "", "123.234.12", 0, "/", "", "", "http://123.234.12/"});
</span><ins>+ checkRelativeURLDifferences("file:c:\\foo\\bar.html", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/c:/foo/bar.html", "", "", "file:///c:/foo/bar.html"},
+ {"file", "", "", "", 0, "/tmp/mock/c:/foo/bar.html", "", "", "file:///tmp/mock/c:/foo/bar.html"});
+ checkRelativeURLDifferences(" File:c|////foo\\bar.html", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/c:////foo/bar.html", "", "", "file:///c:////foo/bar.html"},
+ {"file", "", "", "", 0, "/tmp/mock/c|////foo/bar.html", "", "", "file:///tmp/mock/c|////foo/bar.html"});
+ checkRelativeURLDifferences(" Fil\t\n\te\n\t\n:\t\n\tc\t\n\t|\n\t\n/\t\n\t/\n\t\n//foo\\bar.html", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/c:////foo/bar.html", "", "", "file:///c:////foo/bar.html"},
+ {"file", "", "", "", 0, "/tmp/mock/c|////foo/bar.html", "", "", "file:///tmp/mock/c|////foo/bar.html"});
+ checkRelativeURLDifferences("C|/foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
+ {"file", "", "", "", 0, "/tmp/mock/C|/foo/bar", "", "", "file:///tmp/mock/C|/foo/bar"});
+ checkRelativeURLDifferences("/C|/foo/bar", "file:///tmp/mock/path",
+ {"file", "", "", "", 0, "/C:/foo/bar", "", "", "file:///C:/foo/bar"},
+ {"file", "", "", "", 0, "/C|/foo/bar", "", "", "file:///C|/foo/bar"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span></span></pre>
</div>
</div>
</body>
</html>