<!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>[205097] 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/205097">205097</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-27 22:55:17 -0700 (Sat, 27 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>URLParser should parse relative URLs
https://bugs.webkit.org/show_bug.cgi?id=161282
Patch by Alex Christensen <achristensen@webkit.org> on 2016-08-27
Reviewed by Darin Adler.
Source/WebCore:
Partially covered by new API tests, but once the parser is complete enough we can
use the url web platform tests to more fully test this. It's still a work in
progress only used by tests.
* platform/URLParser.cpp:
(WebCore::URLParser::urlLengthUntilPart):
(WebCore::URLParser::copyURLPartsUntil):
Added some helper functions to reduce redundant code. When parsing relative URLs,
we often want to copy large parts of the base URL, but the stopping point differs.
(WebCore::URLParser::parse):
The parser now returns a URL instead of an Optional<URL> because a URL has a m_isValid which behaves like Optional.
* platform/URLParser.h:
(WebCore::URLParser::parse):
Source/WTF:
* wtf/text/StringView.h:
Use a std::reference_wrapper for the StringView& to make it reassignable so we can add an operator=.
Tools:
* TestWebKitAPI/Tests/WTF/StringView.cpp:
(TestWebKitAPI::TEST):
Added some tests for the new operator=.
Test saving iterators, restoring iterators, and even assigning iterators to new CodePoints objects.
Using the same iterator to iterate multiple objects is bad practice, but it's possible and now tested.
* TestWebKitAPI/Tests/WebCore/URLParser.cpp:
(TestWebKitAPI::checkURL):
(TestWebKitAPI::TEST_F):
(TestWebKitAPI::checkRelativeURL):
(TestWebKitAPI::checkURLDifferences):
(TestWebKitAPI::shouldFail):
Add some relative URL tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
<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="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringViewcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp</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="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Source/WTF/ChangeLog 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-27 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse relative URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161282
+
+ Reviewed by Darin Adler.
+
+ * wtf/text/StringView.h:
+ Use a std::reference_wrapper for the StringView& to make it reassignable so we can add an operator=.
+
</ins><span class="cx"> 2016-08-26 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> bitwise_cast uses inactive member of union
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Source/WTF/wtf/text/StringView.h 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -656,9 +656,10 @@
</span><span class="cx">
</span><span class="cx"> bool operator==(const Iterator&) const;
</span><span class="cx"> bool operator!=(const Iterator&) const;
</span><ins>+ Iterator& operator=(const Iterator&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- const StringView& m_stringView;
</del><ins>+ std::reference_wrapper<const StringView> m_stringView;
</ins><span class="cx"> Optional<unsigned> m_nextCodePointOffset;
</span><span class="cx"> UChar32 m_codePoint;
</span><span class="cx"> };
</span><span class="lines">@@ -723,18 +724,26 @@
</span><span class="cx"> inline auto StringView::CodePoints::Iterator::operator++() -> Iterator&
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_nextCodePointOffset);
</span><del>- if (m_nextCodePointOffset.value() == m_stringView.length()) {
</del><ins>+ if (m_nextCodePointOffset.value() == m_stringView.get().length()) {
</ins><span class="cx"> m_nextCodePointOffset = Nullopt;
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><del>- if (m_stringView.is8Bit())
- m_codePoint = m_stringView.characters8()[m_nextCodePointOffset.value()++];
</del><ins>+ if (m_stringView.get().is8Bit())
+ m_codePoint = m_stringView.get().characters8()[m_nextCodePointOffset.value()++];
</ins><span class="cx"> else
</span><del>- U16_NEXT(m_stringView.characters16(), m_nextCodePointOffset.value(), m_stringView.length(), m_codePoint);
- ASSERT(m_nextCodePointOffset.value() <= m_stringView.length());
</del><ins>+ U16_NEXT(m_stringView.get().characters16(), m_nextCodePointOffset.value(), m_stringView.get().length(), m_codePoint);
+ ASSERT(m_nextCodePointOffset.value() <= m_stringView.get().length());
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline auto StringView::CodePoints::Iterator::operator=(const Iterator& other) -> Iterator&
+{
+ m_stringView = other.m_stringView;
+ m_nextCodePointOffset = other.m_nextCodePointOffset;
+ m_codePoint = other.m_codePoint;
+ return *this;
+}
+
</ins><span class="cx"> inline UChar32 StringView::CodePoints::Iterator::operator*() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_nextCodePointOffset);
</span><span class="lines">@@ -743,7 +752,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool StringView::CodePoints::Iterator::operator==(const Iterator& other) const
</span><span class="cx"> {
</span><del>- ASSERT(&m_stringView == &other.m_stringView);
</del><ins>+ ASSERT(&m_stringView.get() == &other.m_stringView.get());
</ins><span class="cx"> return m_nextCodePointOffset == other.m_nextCodePointOffset;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Source/WebCore/ChangeLog 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-08-27 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse relative URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161282
+
+ Reviewed by Darin Adler.
+
+ Partially covered by new API tests, but once the parser is complete enough we can
+ use the url web platform tests to more fully test this. It's still a work in
+ progress only used by tests.
+
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::urlLengthUntilPart):
+ (WebCore::URLParser::copyURLPartsUntil):
+ Added some helper functions to reduce redundant code. When parsing relative URLs,
+ we often want to copy large parts of the base URL, but the stopping point differs.
+ (WebCore::URLParser::parse):
+ The parser now returns a URL instead of an Optional<URL> because a URL has a m_isValid which behaves like Optional.
+ * platform/URLParser.h:
+ (WebCore::URLParser::parse):
+
</ins><span class="cx"> 2016-08-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update generated bindings to throw a SecurityError when denying cross-origin access to properties
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -48,8 +48,88 @@
</span><span class="cx"> || scheme == "wss";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<URL> URLParser::parse(const String& input, const URL& base, const TextEncoding&)
</del><ins>+enum class URLParser::URLPart {
+ SchemeEnd,
+ UserStart,
+ UserEnd,
+ PasswordEnd,
+ HostEnd,
+ PortEnd,
+ PathAfterLastSlash,
+ PathEnd,
+ QueryEnd,
+ FragmentEnd,
+};
+
+size_t URLParser::urlLengthUntilPart(const URL& url, URLPart part)
</ins><span class="cx"> {
</span><ins>+ switch (part) {
+ case URLPart::FragmentEnd:
+ return url.m_fragmentEnd;
+ case URLPart::QueryEnd:
+ return url.m_queryEnd;
+ case URLPart::PathEnd:
+ return url.m_pathEnd;
+ case URLPart::PathAfterLastSlash:
+ return url.m_pathAfterLastSlash;
+ case URLPart::PortEnd:
+ return url.m_portEnd;
+ case URLPart::HostEnd:
+ return url.m_hostEnd;
+ case URLPart::PasswordEnd:
+ return url.m_passwordEnd;
+ case URLPart::UserEnd:
+ return url.m_userEnd;
+ case URLPart::UserStart:
+ return url.m_userStart;
+ case URLPart::SchemeEnd:
+ return url.m_schemeEnd;
+ }
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+void URLParser::copyURLPartsUntil(const URL& base, URLPart part)
+{
+ m_buffer.clear();
+ m_buffer.append(base.m_string.substring(0, urlLengthUntilPart(base, part)));
+ switch (part) {
+ case URLPart::FragmentEnd:
+ m_url.m_fragmentEnd = base.m_fragmentEnd;
+ FALLTHROUGH;
+ case URLPart::QueryEnd:
+ m_url.m_queryEnd = base.m_queryEnd;
+ FALLTHROUGH;
+ case URLPart::PathEnd:
+ m_url.m_pathEnd = base.m_pathEnd;
+ FALLTHROUGH;
+ case URLPart::PathAfterLastSlash:
+ m_url.m_pathAfterLastSlash = base.m_pathAfterLastSlash;
+ FALLTHROUGH;
+ case URLPart::PortEnd:
+ m_url.m_portEnd = base.m_portEnd;
+ FALLTHROUGH;
+ case URLPart::HostEnd:
+ m_url.m_hostEnd = base.m_hostEnd;
+ FALLTHROUGH;
+ case URLPart::PasswordEnd:
+ m_url.m_passwordEnd = base.m_passwordEnd;
+ FALLTHROUGH;
+ case URLPart::UserEnd:
+ m_url.m_userEnd = base.m_userEnd;
+ FALLTHROUGH;
+ case URLPart::UserStart:
+ m_url.m_userStart = base.m_userStart;
+ FALLTHROUGH;
+ case URLPart::SchemeEnd:
+ m_url.m_isValid = base.m_isValid;
+ m_url.m_protocolIsInHTTPFamily = base.m_protocolIsInHTTPFamily;
+ m_url.m_schemeEnd = base.m_schemeEnd;
+ }
+}
+
+URL URLParser::parse(const String& input, const URL& base, const TextEncoding&)
+{
</ins><span class="cx"> m_url = { };
</span><span class="cx"> m_buffer.clear();
</span><span class="cx"> m_authorityOrHostBuffer.clear();
</span><span class="lines">@@ -98,10 +178,10 @@
</span><span class="cx"> LOG_STATE("SchemeStart");
</span><span class="cx"> if (isASCIIAlpha(*c)) {
</span><span class="cx"> m_buffer.append(toASCIILower(*c));
</span><ins>+ ++c;
</ins><span class="cx"> state = State::Scheme;
</span><span class="cx"> } else
</span><span class="cx"> state = State::NoScheme;
</span><del>- ++c;
</del><span class="cx"> break;
</span><span class="cx"> case State::Scheme:
</span><span class="cx"> LOG_STATE("Scheme");
</span><span class="lines">@@ -124,15 +204,20 @@
</span><span class="cx"> } else {
</span><span class="cx"> m_buffer.clear();
</span><span class="cx"> state = State::NoScheme;
</span><del>- // FIXME: Find a way to start over here.
- notImplemented();
- continue;
</del><ins>+ c = codePoints.begin();
+ break;
</ins><span class="cx"> }
</span><span class="cx"> ++c;
</span><ins>+ if (c == end) {
+ m_buffer.clear();
+ state = State::NoScheme;
+ c = codePoints.begin();
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case State::SchemeEndCheckForSlashes:
</span><span class="cx"> LOG_STATE("SchemeEndCheckForSlashes");
</span><span class="cx"> if (*c == '/') {
</span><ins>+ m_buffer.append('/');
</ins><span class="cx"> state = State::PathOrAuthority;
</span><span class="cx"> ++c;
</span><span class="cx"> } else
</span><span class="lines">@@ -140,60 +225,101 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::NoScheme:
</span><span class="cx"> LOG_STATE("NoScheme");
</span><del>- notImplemented();
- ++c;
</del><ins>+ if (base.isNull()) {
+ if (*c == '#') {
+ copyURLPartsUntil(base, URLPart::QueryEnd);
+ state = State::Fragment;
+ ++c;
+ } else
+ return { };
+ } else if (base.protocol() == "file")
+ state = State::File;
+ else
+ state = State::Relative;
</ins><span class="cx"> break;
</span><span class="cx"> case State::SpecialRelativeOrAuthority:
</span><span class="cx"> LOG_STATE("SpecialRelativeOrAuthority");
</span><span class="cx"> if (*c == '/') {
</span><ins>+ m_buffer.append('/');
</ins><span class="cx"> ++c;
</span><ins>+ while (c != end && isTabOrNewline(*c))
+ ++c;
</ins><span class="cx"> if (c == end)
</span><del>- return Nullopt;
</del><ins>+ return { };
</ins><span class="cx"> if (*c == '/') {
</span><ins>+ m_buffer.append('/');
</ins><span class="cx"> state = State::SpecialAuthorityIgnoreSlashes;
</span><span class="cx"> ++c;
</span><del>- } else
- notImplemented();
</del><ins>+ }
</ins><span class="cx"> } else
</span><span class="cx"> state = State::Relative;
</span><span class="cx"> break;
</span><span class="cx"> case State::PathOrAuthority:
</span><span class="cx"> LOG_STATE("PathOrAuthority");
</span><del>- notImplemented();
- ++c;
</del><ins>+ if (*c == '/') {
+ state = State::AuthorityOrHost;
+ ++c;
+ } else
+ state = State::Path;
</ins><span class="cx"> break;
</span><span class="cx"> case State::Relative:
</span><span class="cx"> LOG_STATE("Relative");
</span><del>- notImplemented();
- ++c;
</del><ins>+ switch (*c) {
+ case '/':
+ case '\\':
+ state = State::RelativeSlash;
+ ++c;
+ break;
+ case '?':
+ copyURLPartsUntil(base, URLPart::PathEnd);
+ state = State::Query;
+ ++c;
+ break;
+ case '#':
+ copyURLPartsUntil(base, URLPart::QueryEnd);
+ state = State::Fragment;
+ ++c;
+ break;
+ default:
+ copyURLPartsUntil(base, URLPart::PathAfterLastSlash);
+ state = State::Path;
+ break;
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case State::RelativeSlash:
</span><span class="cx"> LOG_STATE("RelativeSlash");
</span><del>- notImplemented();
- ++c;
</del><ins>+ if (*c == '/' || *c == '\\') {
+ ++c;
+ state = State::SpecialAuthorityIgnoreSlashes;
+ } else {
+ copyURLPartsUntil(base, URLPart::PortEnd);
+ m_buffer.append('/');
+ m_url.m_pathAfterLastSlash = base.m_portEnd + 1;
+ state = State::Path;
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case State::SpecialAuthoritySlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthoritySlashes");
</span><span class="cx"> if (*c == '/') {
</span><span class="cx"> ++c;
</span><ins>+ while (c != end && isTabOrNewline(*c))
+ ++c;
</ins><span class="cx"> if (c == end)
</span><del>- return Nullopt;
</del><ins>+ return { };
</ins><span class="cx"> m_buffer.append('/');
</span><span class="cx"> if (*c == '/') {
</span><span class="cx"> m_buffer.append('/');
</span><del>- state = State::SpecialAuthorityIgnoreSlashes;
</del><span class="cx"> ++c;
</span><del>- break;
</del><span class="cx"> }
</span><del>- notImplemented();
- } else
- notImplemented();
- ++c;
</del><ins>+ }
+ state = State::SpecialAuthorityIgnoreSlashes;
</ins><span class="cx"> break;
</span><span class="cx"> case State::SpecialAuthorityIgnoreSlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthorityIgnoreSlashes");
</span><del>- if (*c == '/' || *c == '\\')
</del><ins>+ if (*c == '/' || *c == '\\') {
+ m_buffer.append('/');
</ins><span class="cx"> ++c;
</span><ins>+ }
</ins><span class="cx"> m_url.m_userStart = m_buffer.length();
</span><span class="cx"> state = State::AuthorityOrHost;
</span><span class="cx"> break;
</span><span class="lines">@@ -203,6 +329,8 @@
</span><span class="cx"> authorityEndReached();
</span><span class="cx"> state = State::Host;
</span><span class="cx"> } else if (*c == '/' || *c == '?' || *c == '#') {
</span><ins>+ m_url.m_userEnd = m_buffer.length();
+ m_url.m_passwordEnd = m_url.m_userEnd;
</ins><span class="cx"> hostEndReached();
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="lines">@@ -215,7 +343,7 @@
</span><span class="cx"> if (*c == '/' || *c == '?' || *c == '#') {
</span><span class="cx"> hostEndReached();
</span><span class="cx"> state = State::Path;
</span><del>- continue;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> m_authorityOrHostBuffer.append(*c);
</span><span class="cx"> ++c;
</span><span class="lines">@@ -237,8 +365,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::PathStart:
</span><span class="cx"> LOG_STATE("PathStart");
</span><ins>+ if (*c != '/' && *c != '\\')
+ ++c;
</ins><span class="cx"> state = State::Path;
</span><del>- continue;
</del><ins>+ break;
</ins><span class="cx"> case State::Path:
</span><span class="cx"> LOG_STATE("Path");
</span><span class="cx"> if (*c == '/') {
</span><span class="lines">@@ -245,12 +375,16 @@
</span><span class="cx"> m_buffer.append('/');
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_buffer.length();
</span><span class="cx"> ++c;
</span><ins>+ while (c != end && isTabOrNewline(*c))
+ ++c;
</ins><span class="cx"> if (c == end)
</span><span class="cx"> break;
</span><span class="cx"> if (*c == '.') {
</span><span class="cx"> ++c;
</span><ins>+ while (c != end && isTabOrNewline(*c))
+ ++c;
</ins><span class="cx"> if (c == end)
</span><del>- return Nullopt;
</del><ins>+ return { };
</ins><span class="cx"> if (*c == '.')
</span><span class="cx"> notImplemented();
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -258,11 +392,11 @@
</span><span class="cx"> } else if (*c == '?') {
</span><span class="cx"> m_url.m_pathEnd = m_buffer.length();
</span><span class="cx"> state = State::Query;
</span><del>- continue;
</del><ins>+ break;
</ins><span class="cx"> } else if (*c == '#') {
</span><span class="cx"> m_url.m_pathEnd = m_buffer.length();
</span><span class="cx"> state = State::Fragment;
</span><del>- continue;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> // FIXME: Percent encode c
</span><span class="cx"> m_buffer.append(*c);
</span><span class="lines">@@ -278,7 +412,7 @@
</span><span class="cx"> if (*c == '#') {
</span><span class="cx"> m_url.m_queryEnd = m_buffer.length();
</span><span class="cx"> state = State::Fragment;
</span><del>- continue;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> m_buffer.append(*c);
</span><span class="cx"> ++c;
</span><span class="lines">@@ -294,8 +428,8 @@
</span><span class="cx"> switch (state) {
</span><span class="cx"> case State::SchemeStart:
</span><span class="cx"> LOG_FINAL_STATE("SchemeStart");
</span><del>- return Nullopt;
- break;
</del><ins>+ ASSERT_NOT_REACHED();
+ return { };
</ins><span class="cx"> case State::Scheme:
</span><span class="cx"> LOG_FINAL_STATE("Scheme");
</span><span class="cx"> break;
</span><span class="lines">@@ -313,6 +447,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::Relative:
</span><span class="cx"> LOG_FINAL_STATE("Relative");
</span><ins>+ copyURLPartsUntil(base, URLPart::FragmentEnd);
</ins><span class="cx"> break;
</span><span class="cx"> case State::RelativeSlash:
</span><span class="cx"> LOG_FINAL_STATE("RelativeSlash");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -31,17 +31,21 @@
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
</del><ins>+
</ins><span class="cx"> class URLParser {
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT Optional<URL> parse(const String&, const URL& = { }, const TextEncoding& = UTF8Encoding());
</del><ins>+ WEBCORE_EXPORT URL parse(const String&, const URL& = { }, const TextEncoding& = UTF8Encoding());
</ins><span class="cx"> WEBCORE_EXPORT static bool allValuesEqual(const URL&, const URL&);
</span><span class="cx"> private:
</span><span class="cx"> URL m_url;
</span><span class="cx"> StringBuilder m_buffer;
</span><del>- StringBuilder m_authorityOrHostBuffer;
</del><ins>+ StringBuilder m_authorityOrHostBuffer; // FIXME: Save the iterator at the end of the scheme instead of using a second buffer.
</ins><span class="cx"> void authorityEndReached();
</span><span class="cx"> void hostEndReached();
</span><ins>+
+ enum class URLPart;
+ void copyURLPartsUntil(const URL& base, URLPart);
+ static size_t urlLengthUntilPart(const URL&, URLPart);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Tools/ChangeLog 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-08-27 Alex Christensen <achristensen@webkit.org>
+
+ URLParser should parse relative URLs
+ https://bugs.webkit.org/show_bug.cgi?id=161282
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WTF/StringView.cpp:
+ (TestWebKitAPI::TEST):
+ Added some tests for the new operator=.
+ Test saving iterators, restoring iterators, and even assigning iterators to new CodePoints objects.
+ Using the same iterator to iterate multiple objects is bad practice, but it's possible and now tested.
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::checkURL):
+ (TestWebKitAPI::TEST_F):
+ (TestWebKitAPI::checkRelativeURL):
+ (TestWebKitAPI::checkURLDifferences):
+ (TestWebKitAPI::shouldFail):
+ Add some relative URL tests.
+
</ins><span class="cx"> 2016-08-27 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> WTR needs an implementation of setAutomaticLinkDetectionEnabled
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -129,6 +129,19 @@
</span><span class="cx"> ++codePointsIterator;
</span><span class="cx"> ++codePointsIterator;
</span><span class="cx"> EXPECT_EQ(*codePointsIterator, 'l');
</span><ins>+ auto savedIterator = codePointsIterator;
+ codePointsIterator = codePoints.begin();
+ EXPECT_EQ(*codePointsIterator, 'h');
+ codePointsIterator = savedIterator;
+ EXPECT_EQ(*codePointsIterator, 'l');
+ String webkit("webkit");
+ auto webkitCodePoints = StringView(webkit).codePoints();
+ codePointsIterator = webkitCodePoints.begin();
+ ++codePointsIterator;
+ ++codePointsIterator;
+ EXPECT_EQ(*codePointsIterator, 'b');
+ while (codePointsIterator != webkitCodePoints.end())
+ ++codePointsIterator;
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(heloView.codePoints(), {'h', 'e', 'l', 'o'}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(heloView.codeUnits(), {'h', 'e', 'l', 'o'}));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205096 => 205097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-08-28 05:29:05 UTC (rev 205096)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-08-28 05:55:17 UTC (rev 205097)
</span><span class="lines">@@ -55,15 +55,15 @@
</span><span class="cx"> {
</span><span class="cx"> URLParser parser;
</span><span class="cx"> auto url = parser.parse(urlString);
</span><del>- EXPECT_TRUE(eq(parts.protocol, url->protocol()));
- EXPECT_TRUE(eq(parts.user, url->user()));
- EXPECT_TRUE(eq(parts.password, url->pass()));
- EXPECT_TRUE(eq(parts.host, url->host()));
- EXPECT_EQ(parts.port, url->port());
- EXPECT_TRUE(eq(parts.path, url->path()));
- EXPECT_TRUE(eq(parts.query, url->query()));
- EXPECT_TRUE(eq(parts.fragment, url->fragmentIdentifier()));
- EXPECT_TRUE(eq(parts.string, url->string()));
</del><ins>+ EXPECT_TRUE(eq(parts.protocol, url.protocol()));
+ EXPECT_TRUE(eq(parts.user, url.user()));
+ EXPECT_TRUE(eq(parts.password, url.pass()));
+ EXPECT_TRUE(eq(parts.host, url.host()));
+ EXPECT_EQ(parts.port, url.port());
+ EXPECT_TRUE(eq(parts.path, url.path()));
+ EXPECT_TRUE(eq(parts.query, url.query()));
+ EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
+ EXPECT_TRUE(eq(parts.string, url.string()));
</ins><span class="cx">
</span><span class="cx"> auto oldURL = URL(URL(), urlString);
</span><span class="cx"> EXPECT_TRUE(eq(parts.protocol, oldURL.protocol()));
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(parts.fragment, oldURL.fragmentIdentifier()));
</span><span class="cx"> EXPECT_TRUE(eq(parts.string, oldURL.string()));
</span><span class="cx">
</span><del>- EXPECT_TRUE(URLParser::allValuesEqual(url.value(), oldURL));
</del><ins>+ EXPECT_TRUE(URLParser::allValuesEqual(url, oldURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, Parse)
</span><span class="lines">@@ -89,21 +89,62 @@
</span><span class="cx"> checkURL("http://user:pass@webkit.org", {"http", "user", "pass", "webkit.org", 0, "/", "", "", "http://user:pass@webkit.org/"});
</span><span class="cx"> checkURL("http://webkit.org", {"http", "", "", "webkit.org", 0, "/", "", "", "http://webkit.org/"});
</span><span class="cx"> checkURL("http://127.0.0.1", {"http", "", "", "127.0.0.1", 0, "/", "", "", "http://127.0.0.1/"});
</span><ins>+ checkURL("http://webkit.org/", {"http", "", "", "webkit.org", 0, "/", "", "", "http://webkit.org/"});
+ checkURL("http://webkit.org/path1/path2/index.html", {"http", "", "", "webkit.org", 0, "/path1/path2/index.html", "", "", "http://webkit.org/path1/path2/index.html"});
+
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void checkRelativeURL(const String& urlString, const String& baseURLString, const ExpectedParts& parts)
+{
+ URLParser baseParser;
+ auto base = baseParser.parse(baseURLString);
+
+ URLParser parser;
+ auto url = parser.parse(urlString, base);
+ EXPECT_TRUE(eq(parts.protocol, url.protocol()));
+ EXPECT_TRUE(eq(parts.user, url.user()));
+ EXPECT_TRUE(eq(parts.password, url.pass()));
+ EXPECT_TRUE(eq(parts.host, url.host()));
+ EXPECT_EQ(parts.port, url.port());
+ EXPECT_TRUE(eq(parts.path, url.path()));
+ EXPECT_TRUE(eq(parts.query, url.query()));
+ EXPECT_TRUE(eq(parts.fragment, url.fragmentIdentifier()));
+ EXPECT_TRUE(eq(parts.string, url.string()));
+
+ auto oldURL = URL(URL(URL(), baseURLString), urlString);
+ EXPECT_TRUE(eq(parts.protocol, oldURL.protocol()));
+ EXPECT_TRUE(eq(parts.user, oldURL.user()));
+ EXPECT_TRUE(eq(parts.password, oldURL.pass()));
+ EXPECT_TRUE(eq(parts.host, oldURL.host()));
+ EXPECT_EQ(parts.port, oldURL.port());
+ EXPECT_TRUE(eq(parts.path, oldURL.path()));
+ EXPECT_TRUE(eq(parts.query, oldURL.query()));
+ EXPECT_TRUE(eq(parts.fragment, oldURL.fragmentIdentifier()));
+ EXPECT_TRUE(eq(parts.string, oldURL.string()));
+
+ EXPECT_TRUE(URLParser::allValuesEqual(url, oldURL));
+}
+
+TEST_F(URLParserTest, ParseRelative)
+{
+ checkRelativeURL("/index.html", "http://webkit.org/path1/path2/", {"http", "", "", "webkit.org", 0, "/index.html", "", "", "http://webkit.org/index.html"});
+ checkRelativeURL("http://whatwg.org/index.html", "http://webkit.org/path1/path2/", {"http", "", "", "whatwg.org", 0, "/index.html", "", "", "http://whatwg.org/index.html"});
+ checkRelativeURL("index.html", "http://webkit.org/path1/path2/page.html?query#fragment", {"http", "", "", "webkit.org", 0, "/path1/path2/index.html", "", "", "http://webkit.org/path1/path2/index.html"});
+}
+
</ins><span class="cx"> static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
</span><span class="cx"> {
</span><span class="cx"> URLParser parser;
</span><span class="cx"> auto url = parser.parse(urlString);
</span><del>- EXPECT_TRUE(eq(partsNew.protocol, url->protocol()));
- EXPECT_TRUE(eq(partsNew.user, url->user()));
- EXPECT_TRUE(eq(partsNew.password, url->pass()));
- EXPECT_TRUE(eq(partsNew.host, url->host()));
- EXPECT_EQ(partsNew.port, url->port());
- EXPECT_TRUE(eq(partsNew.path, url->path()));
- EXPECT_TRUE(eq(partsNew.query, url->query()));
- EXPECT_TRUE(eq(partsNew.fragment, url->fragmentIdentifier()));
- EXPECT_TRUE(eq(partsNew.string, url->string()));
</del><ins>+ EXPECT_TRUE(eq(partsNew.protocol, url.protocol()));
+ EXPECT_TRUE(eq(partsNew.user, url.user()));
+ EXPECT_TRUE(eq(partsNew.password, url.pass()));
+ EXPECT_TRUE(eq(partsNew.host, url.host()));
+ EXPECT_EQ(partsNew.port, url.port());
+ EXPECT_TRUE(eq(partsNew.path, url.path()));
+ EXPECT_TRUE(eq(partsNew.query, url.query()));
+ EXPECT_TRUE(eq(partsNew.fragment, url.fragmentIdentifier()));
+ EXPECT_TRUE(eq(partsNew.string, url.string()));
</ins><span class="cx">
</span><span class="cx"> auto oldURL = URL(URL(), urlString);
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol()));
</span><span class="lines">@@ -116,7 +157,7 @@
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.fragment, oldURL.fragmentIdentifier()));
</span><span class="cx"> EXPECT_TRUE(eq(partsOld.string, oldURL.string()));
</span><span class="cx">
</span><del>- EXPECT_FALSE(URLParser::allValuesEqual(url.value(), oldURL));
</del><ins>+ EXPECT_FALSE(URLParser::allValuesEqual(url, oldURL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, ParserDifferences)
</span><span class="lines">@@ -133,7 +174,7 @@
</span><span class="cx"> {
</span><span class="cx"> URLParser parser;
</span><span class="cx"> auto invalidURL = parser.parse(urlString);
</span><del>- EXPECT_TRUE(invalidURL == Nullopt);
</del><ins>+ EXPECT_TRUE(URLParser::allValuesEqual(invalidURL, { }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, ParserFailures)
</span></span></pre>
</div>
</div>
</body>
</html>