<!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>[206334] 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/206334">206334</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-09-23 15:32:28 -0700 (Fri, 23 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor URLParser
https://bugs.webkit.org/show_bug.cgi?id=162516
Reviewed by Brady Eidson.
Source/WebCore:
Turn more static functions into methods, use a helper function to append characters to a buffer.
No change in behavior, but I added a new API test to cover an interesting
ipv6 address parsing case that had no coverage.
* platform/URLParser.cpp:
(WebCore::CodePointIterator::codeUnitsSince):
(WebCore::URLParser::isWindowsDriveLetter):
(WebCore::URLParser::appendToASCIIBuffer):
(WebCore::URLParser::checkWindowsDriveLetter):
(WebCore::URLParser::percentEncodeByte):
(WebCore::URLParser::utf8PercentEncode):
(WebCore::URLParser::utf8QueryEncode):
(WebCore::URLParser::encodeQuery):
(WebCore::URLParser::copyASCIIStringUntil):
(WebCore::URLParser::copyURLPartsUntil):
(WebCore::URLParser::URLParser):
(WebCore::URLParser::parse):
(WebCore::URLParser::parseAuthority):
(WebCore::URLParser::parsePort):
(WebCore::URLParser::parseHostAndPort):
(WebCore::utf8PercentEncode): Deleted.
(WebCore::utf8QueryEncode): Deleted.
(WebCore::encodeQuery): Deleted.
(WebCore::copyASCIIStringUntil): Deleted.
* platform/URLParser.h:
(WebCore::URLParser::appendToASCIIBuffer):
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="#trunkSourceWebCoreplatformURLParserh">trunk/Source/WebCore/platform/URLParser.h</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 (206333 => 206334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-23 22:24:27 UTC (rev 206333)
+++ trunk/Source/WebCore/ChangeLog 2016-09-23 22:32:28 UTC (rev 206334)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-09-23 Alex Christensen <achristensen@webkit.org>
+
+ Refactor URLParser
+ https://bugs.webkit.org/show_bug.cgi?id=162516
+
+ Reviewed by Brady Eidson.
+
+ Turn more static functions into methods, use a helper function to append characters to a buffer.
+
+ No change in behavior, but I added a new API test to cover an interesting
+ ipv6 address parsing case that had no coverage.
+
+ * platform/URLParser.cpp:
+ (WebCore::CodePointIterator::codeUnitsSince):
+ (WebCore::URLParser::isWindowsDriveLetter):
+ (WebCore::URLParser::appendToASCIIBuffer):
+ (WebCore::URLParser::checkWindowsDriveLetter):
+ (WebCore::URLParser::percentEncodeByte):
+ (WebCore::URLParser::utf8PercentEncode):
+ (WebCore::URLParser::utf8QueryEncode):
+ (WebCore::URLParser::encodeQuery):
+ (WebCore::URLParser::copyASCIIStringUntil):
+ (WebCore::URLParser::copyURLPartsUntil):
+ (WebCore::URLParser::URLParser):
+ (WebCore::URLParser::parse):
+ (WebCore::URLParser::parseAuthority):
+ (WebCore::URLParser::parsePort):
+ (WebCore::URLParser::parseHostAndPort):
+ (WebCore::utf8PercentEncode): Deleted.
+ (WebCore::utf8QueryEncode): Deleted.
+ (WebCore::encodeQuery): Deleted.
+ (WebCore::copyASCIIStringUntil): Deleted.
+ * platform/URLParser.h:
+ (WebCore::URLParser::appendToASCIIBuffer):
+
</ins><span class="cx"> 2016-09-23 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Implement parsing of Async Functions
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.cpp (206333 => 206334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-23 22:24:27 UTC (rev 206333)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-23 22:32:28 UTC (rev 206334)
</span><span class="lines">@@ -72,6 +72,12 @@
</span><span class="cx"> return m_begin >= m_end;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ size_t codeUnitsSince(const CharacterType* reference) const
+ {
+ ASSERT(m_begin >= reference);
+ return m_begin - reference;
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> const CharacterType* m_begin { nullptr };
</span><span class="cx"> const CharacterType* m_end { nullptr };
</span><span class="lines">@@ -419,7 +425,11 @@
</span><span class="cx"> incrementIteratorSkippingTabAndNewLine(iterator);
</span><span class="cx"> if (iterator.atEnd())
</span><span class="cx"> return false;
</span><del>- return *iterator == ':' || *iterator == '|';
</del><ins>+ if (*iterator == ':')
+ return true;
+ if (*iterator == '|')
+ return true;
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline static bool isWindowsDriveLetter(const Vector<LChar>& buffer, size_t index)
</span><span class="lines">@@ -429,16 +439,28 @@
</span><span class="cx"> return isASCIIAlpha(buffer[index]) && (buffer[index + 1] == ':' || buffer[index + 1] == '|');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void URLParser::appendToASCIIBuffer(UChar32 codePoint)
+{
+ ASSERT(m_unicodeFragmentBuffer.isEmpty());
+ ASSERT(isASCII(codePoint));
+ m_asciiBuffer.append(codePoint);
+}
+
+void URLParser::appendToASCIIBuffer(const char* characters, size_t length)
+{
+ ASSERT(m_unicodeFragmentBuffer.isEmpty());
+ m_asciiBuffer.append(characters, length);
+}
+
</ins><span class="cx"> template<typename CharacterType>
</span><del>-void URLParser::checkWindowsDriveLetter(CodePointIterator<CharacterType>& iterator, Vector<LChar>& asciiBuffer)
</del><ins>+void URLParser::checkWindowsDriveLetter(CodePointIterator<CharacterType>& iterator)
</ins><span class="cx"> {
</span><span class="cx"> if (isWindowsDriveLetter(iterator)) {
</span><del>- asciiBuffer.reserveCapacity(asciiBuffer.size() + 2);
- asciiBuffer.uncheckedAppend(*iterator);
</del><ins>+ appendToASCIIBuffer(*iterator);
</ins><span class="cx"> incrementIteratorSkippingTabAndNewLine(iterator);
</span><span class="cx"> ASSERT(!iterator.atEnd());
</span><span class="cx"> ASSERT(*iterator == ':' || *iterator == '|');
</span><del>- asciiBuffer.uncheckedAppend(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> incrementIteratorSkippingTabAndNewLine(iterator);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -466,22 +488,30 @@
</span><span class="cx"> buffer.append(lowerNibbleToASCIIHexDigit(byte));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const char* replacementCharacterUTF8PercentEncoded = "%EF%BF%BD";
-const size_t replacementCharacterUTF8PercentEncodedLength = 9;
</del><ins>+void URLParser::percentEncodeByte(uint8_t byte)
+{
+ appendToASCIIBuffer('%');
+ appendToASCIIBuffer(upperNibbleToASCIIHexDigit(byte));
+ appendToASCIIBuffer(lowerNibbleToASCIIHexDigit(byte));
+}
</ins><span class="cx">
</span><del>-inline static void utf8PercentEncode(UChar32 codePoint, Vector<LChar>& destination, bool(*isInCodeSet)(UChar32))
</del><ins>+const char replacementCharacterUTF8PercentEncoded[10] = "%EF%BF%BD";
+const size_t replacementCharacterUTF8PercentEncodedLength = sizeof(replacementCharacterUTF8PercentEncoded) - 1;
+
+template<bool(*isInCodeSet)(UChar32)>
+void URLParser::utf8PercentEncode(UChar32 codePoint)
</ins><span class="cx"> {
</span><span class="cx"> if (isASCII(codePoint)) {
</span><span class="cx"> if (isInCodeSet(codePoint))
</span><del>- percentEncodeByte(codePoint, destination);
</del><ins>+ percentEncodeByte(codePoint);
</ins><span class="cx"> else
</span><del>- destination.append(codePoint);
</del><ins>+ appendToASCIIBuffer(codePoint);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_WITH_MESSAGE(isInCodeSet(codePoint), "isInCodeSet should always return true for non-ASCII characters");
</span><span class="cx">
</span><span class="cx"> if (!U_IS_UNICODE_CHAR(codePoint)) {
</span><del>- destination.append(replacementCharacterUTF8PercentEncoded, replacementCharacterUTF8PercentEncodedLength);
</del><ins>+ appendToASCIIBuffer(replacementCharacterUTF8PercentEncoded, replacementCharacterUTF8PercentEncodedLength);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -489,21 +519,22 @@
</span><span class="cx"> int32_t offset = 0;
</span><span class="cx"> U8_APPEND_UNSAFE(buffer, offset, codePoint);
</span><span class="cx"> for (int32_t i = 0; i < offset; ++i)
</span><del>- percentEncodeByte(buffer[i], destination);
</del><ins>+ percentEncodeByte(buffer[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline static void utf8QueryEncode(UChar32 codePoint, Vector<LChar>& destination)
</del><ins>+
+void URLParser::utf8QueryEncode(UChar32 codePoint)
</ins><span class="cx"> {
</span><span class="cx"> if (isASCII(codePoint)) {
</span><span class="cx"> if (shouldPercentEncodeQueryByte(codePoint))
</span><del>- percentEncodeByte(codePoint, destination);
</del><ins>+ percentEncodeByte(codePoint);
</ins><span class="cx"> else
</span><del>- destination.append(codePoint);
</del><ins>+ appendToASCIIBuffer(codePoint);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!U_IS_UNICODE_CHAR(codePoint)) {
</span><del>- destination.append(replacementCharacterUTF8PercentEncoded, replacementCharacterUTF8PercentEncodedLength);
</del><ins>+ appendToASCIIBuffer(replacementCharacterUTF8PercentEncoded, replacementCharacterUTF8PercentEncodedLength);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -513,13 +544,13 @@
</span><span class="cx"> for (int32_t i = 0; i < offset; ++i) {
</span><span class="cx"> auto byte = buffer[i];
</span><span class="cx"> if (shouldPercentEncodeQueryByte(byte))
</span><del>- percentEncodeByte(byte, destination);
</del><ins>+ percentEncodeByte(byte);
</ins><span class="cx"> else
</span><del>- destination.append(byte);
</del><ins>+ appendToASCIIBuffer(byte);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static void encodeQuery(const Vector<UChar>& source, Vector<LChar>& destination, const TextEncoding& encoding)
</del><ins>+void URLParser::encodeQuery(const Vector<UChar>& source, const TextEncoding& encoding)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: It is unclear in the spec what to do when encoding fails. The behavior should be specified and tested.
</span><span class="cx"> CString encoded = encoding.encode(StringView(source.data(), source.size()), URLEncodedEntitiesForUnencodables);
</span><span class="lines">@@ -528,9 +559,9 @@
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><span class="cx"> uint8_t byte = data[i];
</span><span class="cx"> if (shouldPercentEncodeQueryByte(byte))
</span><del>- percentEncodeByte(byte, destination);
</del><ins>+ percentEncodeByte(byte);
</ins><span class="cx"> else
</span><del>- destination.append(byte);
</del><ins>+ appendToASCIIBuffer(byte);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -689,7 +720,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static void copyASCIIStringUntil(Vector<LChar>& destination, const String& string, size_t lengthIf8Bit, size_t lengthIf16Bit)
</del><ins>+void URLParser::copyASCIIStringUntil(const String& string, size_t lengthIf8Bit, size_t lengthIf16Bit)
</ins><span class="cx"> {
</span><span class="cx"> if (string.isNull()) {
</span><span class="cx"> ASSERT(!lengthIf8Bit);
</span><span class="lines">@@ -696,18 +727,17 @@
</span><span class="cx"> ASSERT(!lengthIf16Bit);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- ASSERT(destination.isEmpty());
</del><ins>+ ASSERT(m_asciiBuffer.isEmpty());
</ins><span class="cx"> if (string.is8Bit()) {
</span><span class="cx"> RELEASE_ASSERT(lengthIf8Bit <= string.length());
</span><del>- destination.append(string.characters8(), lengthIf8Bit);
</del><ins>+ appendToASCIIBuffer(string.characters8(), lengthIf8Bit);
</ins><span class="cx"> } else {
</span><span class="cx"> RELEASE_ASSERT(lengthIf16Bit <= string.length());
</span><del>- destination.reserveCapacity(lengthIf16Bit);
</del><span class="cx"> const UChar* characters = string.characters16();
</span><span class="cx"> for (size_t i = 0; i < lengthIf16Bit; ++i) {
</span><span class="cx"> UChar c = characters[i];
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(isASCII(c));
</span><del>- destination.uncheckedAppend(c);
</del><ins>+ appendToASCIIBuffer(c);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -717,7 +747,7 @@
</span><span class="cx"> m_asciiBuffer.clear();
</span><span class="cx"> m_unicodeFragmentBuffer.clear();
</span><span class="cx"> if (part == URLPart::FragmentEnd) {
</span><del>- copyASCIIStringUntil(m_asciiBuffer, base.m_string, urlLengthUntilPart(base, URLPart::FragmentEnd), urlLengthUntilPart(base, URLPart::QueryEnd));
</del><ins>+ copyASCIIStringUntil(base.m_string, urlLengthUntilPart(base, URLPart::FragmentEnd), urlLengthUntilPart(base, URLPart::QueryEnd));
</ins><span class="cx"> if (!base.m_string.is8Bit()) {
</span><span class="cx"> const String& fragment = base.m_string;
</span><span class="cx"> bool seenUnicode = false;
</span><span class="lines">@@ -732,7 +762,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> size_t length = urlLengthUntilPart(base, part);
</span><del>- copyASCIIStringUntil(m_asciiBuffer, base.m_string, length, length);
</del><ins>+ copyASCIIStringUntil(base.m_string, length, length);
</ins><span class="cx"> }
</span><span class="cx"> switch (part) {
</span><span class="cx"> case URLPart::FragmentEnd:
</span><span class="lines">@@ -907,6 +937,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (input.isNull())
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> if (input.is8Bit())
</span><span class="cx"> parse(input.characters8(), input.length(), base, encoding);
</span><span class="cx"> else
</span><span class="lines">@@ -984,7 +1015,7 @@
</span><span class="cx"> case State::Scheme:
</span><span class="cx"> LOG_STATE("Scheme");
</span><span class="cx"> if (isValidSchemeCharacter(*c))
</span><del>- m_asciiBuffer.append(toASCIILower(*c));
</del><ins>+ appendToASCIIBuffer(toASCIILower(*c));
</ins><span class="cx"> else if (*c == ':') {
</span><span class="cx"> m_url.m_schemeEnd = m_asciiBuffer.size();
</span><span class="cx"> StringView urlScheme = StringView(m_asciiBuffer.data(), m_url.m_schemeEnd);
</span><span class="lines">@@ -992,11 +1023,11 @@
</span><span class="cx"> if (urlScheme == "file") {
</span><span class="cx"> m_urlIsSpecial = true;
</span><span class="cx"> state = State::File;
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> if (isSpecialScheme(urlScheme)) {
</span><span class="cx"> m_urlIsSpecial = true;
</span><span class="cx"> if (base.protocolIs(m_asciiBuffer.data(), m_asciiBuffer.size() - 1))
</span><span class="lines">@@ -1007,7 +1038,7 @@
</span><span class="cx"> auto maybeSlash = c;
</span><span class="cx"> incrementIteratorSkippingTabAndNewLine(maybeSlash);
</span><span class="cx"> if (!maybeSlash.atEnd() && *maybeSlash == '/') {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size();
</span><span class="cx"> state = State::PathOrAuthority;
</span><span class="cx"> c = maybeSlash;
</span><span class="lines">@@ -1047,7 +1078,7 @@
</span><span class="cx"> if (base.m_cannotBeABaseURL && *c == '#') {
</span><span class="cx"> copyURLPartsUntil(base, URLPart::QueryEnd);
</span><span class="cx"> state = State::Fragment;
</span><del>- m_asciiBuffer.append('#');
</del><ins>+ appendToASCIIBuffer('#');
</ins><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1056,13 +1087,13 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> copyURLPartsUntil(base, URLPart::SchemeEnd);
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> state = State::File;
</span><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><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> incrementIteratorSkippingTabAndNewLine(c);
</span><span class="cx"> if (c.atEnd()) {
</span><span class="cx"> failure();
</span><span class="lines">@@ -1069,7 +1100,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (*c == '/') {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> state = State::SpecialAuthorityIgnoreSlashes;
</span><span class="cx"> ++c;
</span><span class="cx"> } else
</span><span class="lines">@@ -1080,7 +1111,7 @@
</span><span class="cx"> case State::PathOrAuthority:
</span><span class="cx"> LOG_STATE("PathOrAuthority");
</span><span class="cx"> if (*c == '/') {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size();
</span><span class="cx"> state = State::AuthorityOrHost;
</span><span class="cx"> ++c;
</span><span class="lines">@@ -1106,13 +1137,13 @@
</span><span class="cx"> break;
</span><span class="cx"> case '?':
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PathEnd);
</span><del>- m_asciiBuffer.append('?');
</del><ins>+ appendToASCIIBuffer('?');
</ins><span class="cx"> state = State::Query;
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> case '#':
</span><span class="cx"> copyURLPartsUntil(base, URLPart::QueryEnd);
</span><del>- m_asciiBuffer.append('#');
</del><ins>+ appendToASCIIBuffer('#');
</ins><span class="cx"> state = State::Fragment;
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="lines">@@ -1127,11 +1158,11 @@
</span><span class="cx"> if (*c == '/' || *c == '\\') {
</span><span class="cx"> ++c;
</span><span class="cx"> copyURLPartsUntil(base, URLPart::SchemeEnd);
</span><del>- m_asciiBuffer.append("://", 3);
</del><ins>+ appendToASCIIBuffer("://", 3);
</ins><span class="cx"> state = State::SpecialAuthorityIgnoreSlashes;
</span><span class="cx"> } else {
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PortEnd);
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = base.m_portEnd + 1;
</span><span class="cx"> state = State::Path;
</span><span class="cx"> }
</span><span class="lines">@@ -1138,7 +1169,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::SpecialAuthoritySlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthoritySlashes");
</span><del>- m_asciiBuffer.append("//", 2);
</del><ins>+ appendToASCIIBuffer("//", 2);
</ins><span class="cx"> if (*c == '/' || *c == '\\') {
</span><span class="cx"> incrementIteratorSkippingTabAndNewLine(c);
</span><span class="cx"> if (!c.atEnd() && (*c == '/' || *c == '\\'))
</span><span class="lines">@@ -1149,7 +1180,7 @@
</span><span class="cx"> case State::SpecialAuthorityIgnoreSlashes:
</span><span class="cx"> LOG_STATE("SpecialAuthorityIgnoreSlashes");
</span><span class="cx"> if (*c == '/' || *c == '\\') {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> ++c;
</span><span class="cx"> }
</span><span class="cx"> m_url.m_userStart = m_asciiBuffer.size();
</span><span class="lines">@@ -1184,7 +1215,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (!isSlash) {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_asciiBuffer.size();
</span><span class="cx"> }
</span><span class="cx"> state = State::Path;
</span><span class="lines">@@ -1214,7 +1245,7 @@
</span><span class="cx"> switch (*c) {
</span><span class="cx"> case '/':
</span><span class="cx"> case '\\':
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> state = State::FileSlash;
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="lines">@@ -1221,7 +1252,7 @@
</span><span class="cx"> case '?':
</span><span class="cx"> if (base.isValid() && base.protocolIs("file"))
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PathEnd);
</span><del>- m_asciiBuffer.append("///?", 4);
</del><ins>+ appendToASCIIBuffer("///?", 4);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 2;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1235,7 +1266,7 @@
</span><span class="cx"> case '#':
</span><span class="cx"> if (base.isValid() && base.protocolIs("file"))
</span><span class="cx"> copyURLPartsUntil(base, URLPart::QueryEnd);
</span><del>- m_asciiBuffer.append("///#", 4);
</del><ins>+ appendToASCIIBuffer("///#", 4);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 2;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1251,7 +1282,7 @@
</span><span class="cx"> if (base.isValid() && base.protocolIs("file") && shouldCopyFileURL(c))
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PathAfterLastSlash);
</span><span class="cx"> else {
</span><del>- m_asciiBuffer.append("///", 3);
</del><ins>+ appendToASCIIBuffer("///", 3);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1258,7 +1289,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><del>- checkWindowsDriveLetter(c, m_asciiBuffer);
</del><ins>+ checkWindowsDriveLetter(c);
</ins><span class="cx"> }
</span><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="lines">@@ -1268,7 +1299,7 @@
</span><span class="cx"> LOG_STATE("FileSlash");
</span><span class="cx"> if (*c == '/' || *c == '\\') {
</span><span class="cx"> ++c;
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size();
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1286,12 +1317,12 @@
</span><span class="cx"> ? isWindowsDriveLetter(CodePointIterator<LChar>(basePath.characters8(), basePath.characters8() + basePath.length()))
</span><span class="cx"> : isWindowsDriveLetter(CodePointIterator<UChar>(basePath.characters16(), basePath.characters16() + basePath.length()));
</span><span class="cx"> if (windowsQuirk) {
</span><del>- m_asciiBuffer.append(basePath[0]);
- m_asciiBuffer.append(basePath[1]);
</del><ins>+ appendToASCIIBuffer(basePath[0]);
+ appendToASCIIBuffer(basePath[1]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append("//", 2);
</del><ins>+ appendToASCIIBuffer("//", 2);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1298,7 +1329,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><del>- checkWindowsDriveLetter(c, m_asciiBuffer);
</del><ins>+ checkWindowsDriveLetter(c);
</ins><span class="cx"> state = State::Path;
</span><span class="cx"> break;
</span><span class="cx"> case State::FileHost:
</span><span class="lines">@@ -1311,7 +1342,7 @@
</span><span class="cx"> if (authorityOrHostBegin == c) {
</span><span class="cx"> ASSERT(m_asciiBuffer[m_asciiBuffer.size() - 1] == '/');
</span><span class="cx"> if (*c == '?') {
</span><del>- m_asciiBuffer.append("/?", 2);
</del><ins>+ appendToASCIIBuffer("/?", 2);
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_pathEnd = m_url.m_pathAfterLastSlash;
</span><span class="cx"> state = State::Query;
</span><span class="lines">@@ -1319,7 +1350,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (*c == '#') {
</span><del>- m_asciiBuffer.append("/#", 2);
</del><ins>+ appendToASCIIBuffer("/#", 2);
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_asciiBuffer.size() - 1;
</span><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="lines">@@ -1357,7 +1388,7 @@
</span><span class="cx"> case State::Path:
</span><span class="cx"> LOG_STATE("Path");
</span><span class="cx"> if (*c == '/' || (m_urlIsSpecial && *c == '\\')) {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_asciiBuffer.size();
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="lines">@@ -1385,7 +1416,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (isPercentEncodedDot(c)) {
</span><del>- m_asciiBuffer.append('.');
</del><ins>+ appendToASCIIBuffer('.');
</ins><span class="cx"> ASSERT(*c == '%');
</span><span class="cx"> ++c;
</span><span class="cx"> ASSERT(*c == dotASCIICode[0]);
</span><span class="lines">@@ -1394,7 +1425,7 @@
</span><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- utf8PercentEncode(*c, m_asciiBuffer, isInDefaultEncodeSet);
</del><ins>+ utf8PercentEncode<isInDefaultEncodeSet>(*c);
</ins><span class="cx"> ++c;
</span><span class="cx"> break;
</span><span class="cx"> case State::CannotBeABaseURLPath:
</span><span class="lines">@@ -1407,11 +1438,11 @@
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="cx"> state = State::Fragment;
</span><span class="cx"> } else if (*c == '/') {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_asciiBuffer.size();
</span><span class="cx"> ++c;
</span><span class="cx"> } else {
</span><del>- utf8PercentEncode(*c, m_asciiBuffer, isInSimpleEncodeSet);
</del><ins>+ utf8PercentEncode<isInSimpleEncodeSet>(*c);
</ins><span class="cx"> ++c;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -1419,13 +1450,13 @@
</span><span class="cx"> LOG_STATE("Query");
</span><span class="cx"> if (*c == '#') {
</span><span class="cx"> if (!isUTF8Encoding)
</span><del>- encodeQuery(queryBuffer, m_asciiBuffer, encoding);
</del><ins>+ encodeQuery(queryBuffer, encoding);
</ins><span class="cx"> m_url.m_queryEnd = m_asciiBuffer.size();
</span><span class="cx"> state = State::Fragment;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (isUTF8Encoding)
</span><del>- utf8QueryEncode(*c, m_asciiBuffer);
</del><ins>+ utf8QueryEncode(*c);
</ins><span class="cx"> else
</span><span class="cx"> appendCodePoint(queryBuffer, *c);
</span><span class="cx"> ++c;
</span><span class="lines">@@ -1433,7 +1464,7 @@
</span><span class="cx"> case State::Fragment:
</span><span class="cx"> LOG_STATE("Fragment");
</span><span class="cx"> if (m_unicodeFragmentBuffer.isEmpty() && isASCII(*c))
</span><del>- m_asciiBuffer.append(*c);
</del><ins>+ appendToASCIIBuffer(*c);
</ins><span class="cx"> else
</span><span class="cx"> appendCodePoint(m_unicodeFragmentBuffer, *c);
</span><span class="cx"> ++c;
</span><span class="lines">@@ -1484,7 +1515,7 @@
</span><span class="cx"> case State::RelativeSlash:
</span><span class="cx"> LOG_FINAL_STATE("RelativeSlash");
</span><span class="cx"> copyURLPartsUntil(base, URLPart::PortEnd);
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = base.m_portEnd + 1;
</span><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="lines">@@ -1518,7 +1549,7 @@
</span><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathEnd = m_url.m_portEnd + 1;
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="lines">@@ -1530,7 +1561,7 @@
</span><span class="cx"> failure();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathEnd = m_url.m_portEnd + 1;
</span><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
</span><span class="cx"> m_url.m_queryEnd = m_url.m_pathEnd;
</span><span class="lines">@@ -1540,9 +1571,9 @@
</span><span class="cx"> LOG_FINAL_STATE("File");
</span><span class="cx"> if (base.isValid() && base.protocolIs("file")) {
</span><span class="cx"> copyURLPartsUntil(base, URLPart::QueryEnd);
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> }
</span><del>- m_asciiBuffer.append("///", 3);
</del><ins>+ appendToASCIIBuffer("///", 3);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1555,7 +1586,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case State::FileSlash:
</span><span class="cx"> LOG_FINAL_STATE("FileSlash");
</span><del>- m_asciiBuffer.append("//", 2);
</del><ins>+ appendToASCIIBuffer("//", 2);
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1569,7 +1600,7 @@
</span><span class="cx"> case State::FileHost:
</span><span class="cx"> LOG_FINAL_STATE("FileHost");
</span><span class="cx"> if (authorityOrHostBegin == c) {
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_userStart = m_asciiBuffer.size() - 1;
</span><span class="cx"> m_url.m_userEnd = m_url.m_userStart;
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userStart;
</span><span class="lines">@@ -1592,7 +1623,7 @@
</span><span class="cx"> m_url.m_hostEnd = m_asciiBuffer.size();
</span><span class="cx"> m_url.m_portEnd = m_url.m_hostEnd;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append('/');
</del><ins>+ appendToASCIIBuffer('/');
</ins><span class="cx"> m_url.m_pathAfterLastSlash = m_url.m_hostEnd + 1;
</span><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="lines">@@ -1616,7 +1647,7 @@
</span><span class="cx"> case State::Query:
</span><span class="cx"> LOG_FINAL_STATE("Query");
</span><span class="cx"> if (!isUTF8Encoding)
</span><del>- encodeQuery(queryBuffer, m_asciiBuffer, encoding);
</del><ins>+ encodeQuery(queryBuffer, encoding);
</ins><span class="cx"> m_url.m_queryEnd = m_asciiBuffer.size();
</span><span class="cx"> m_url.m_fragmentEnd = m_url.m_queryEnd;
</span><span class="cx"> break;
</span><span class="lines">@@ -1655,20 +1686,20 @@
</span><span class="cx"> if (iterator.atEnd()) {
</span><span class="cx"> m_url.m_passwordEnd = m_url.m_userEnd;
</span><span class="cx"> if (m_url.m_userEnd > m_url.m_userStart)
</span><del>- m_asciiBuffer.append('@');
</del><ins>+ appendToASCIIBuffer('@');
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- utf8PercentEncode(*iterator, m_asciiBuffer, isInUserInfoEncodeSet);
</del><ins>+ utf8PercentEncode<isInUserInfoEncodeSet>(*iterator);
</ins><span class="cx"> }
</span><span class="cx"> for (; !iterator.atEnd(); ++iterator)
</span><del>- utf8PercentEncode(*iterator, m_asciiBuffer, isInUserInfoEncodeSet);
</del><ins>+ utf8PercentEncode<isInUserInfoEncodeSet>(*iterator);
</ins><span class="cx"> m_url.m_passwordEnd = m_asciiBuffer.size();
</span><span class="cx"> if (!m_url.m_userEnd)
</span><span class="cx"> m_url.m_userEnd = m_url.m_passwordEnd;
</span><del>- m_asciiBuffer.append('@');
</del><ins>+ appendToASCIIBuffer('@');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename UnsignedIntegerType>
</span><span class="lines">@@ -2050,7 +2081,7 @@
</span><span class="cx"> m_url.m_portEnd = m_asciiBuffer.size();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- m_asciiBuffer.append(':');
</del><ins>+ appendToASCIIBuffer(':');
</ins><span class="cx"> for (; !iterator.atEnd(); ++iterator) {
</span><span class="cx"> if (isTabOrNewline(*iterator))
</span><span class="cx"> continue;
</span><span class="lines">@@ -2120,7 +2151,7 @@
</span><span class="cx"> }
</span><span class="cx"> for (; hostIterator != iterator; ++hostIterator) {
</span><span class="cx"> if (!isTabOrNewline(*hostIterator))
</span><del>- m_asciiBuffer.append(toASCIILower(*hostIterator));
</del><ins>+ appendToASCIIBuffer(toASCIILower(*hostIterator));
</ins><span class="cx"> }
</span><span class="cx"> m_url.m_hostEnd = m_asciiBuffer.size();
</span><span class="cx"> if (!hostIterator.atEnd()) {
</span><span class="lines">@@ -2165,7 +2196,7 @@
</span><span class="cx"> return parsePort(iterator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_asciiBuffer.append(asciiDomainCharacters, asciiDomainValue.size());
</del><ins>+ appendToASCIIBuffer(asciiDomainCharacters, asciiDomainValue.size());
</ins><span class="cx"> m_url.m_hostEnd = m_asciiBuffer.size();
</span><span class="cx"> if (!iterator.atEnd()) {
</span><span class="cx"> ASSERT(*iterator == ':');
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URLParser.h (206333 => 206334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URLParser.h 2016-09-23 22:24:27 UTC (rev 206333)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-09-23 22:32:28 UTC (rev 206334)
</span><span class="lines">@@ -67,7 +67,15 @@
</span><span class="cx"> template<typename CharacterType> void syntaxError(const CodePointIterator<CharacterType>&);
</span><span class="cx"> template<typename CharacterType> bool isWindowsDriveLetter(CodePointIterator<CharacterType>);
</span><span class="cx"> template<typename CharacterType> bool shouldCopyFileURL(CodePointIterator<CharacterType>);
</span><del>- template<typename CharacterType> void checkWindowsDriveLetter(CodePointIterator<CharacterType>&, Vector<LChar>& asciiBuffer);
</del><ins>+ template<typename CharacterType> void checkWindowsDriveLetter(CodePointIterator<CharacterType>&);
+ template<bool(*isInCodeSet)(UChar32)> void utf8PercentEncode(UChar32);
+ void utf8QueryEncode(UChar32);
+ void percentEncodeByte(uint8_t);
+ void appendToASCIIBuffer(UChar32);
+ void appendToASCIIBuffer(const char*, size_t);
+ void appendToASCIIBuffer(const LChar* characters, size_t size) { appendToASCIIBuffer(reinterpret_cast<const char*>(characters), size); }
+ void encodeQuery(const Vector<UChar>& source, const TextEncoding&);
+ void copyASCIIStringUntil(const String&, size_t lengthIf8Bit, size_t lengthIf16Bit);
</ins><span class="cx">
</span><span class="cx"> enum class URLPart;
</span><span class="cx"> void copyURLPartsUntil(const URL& base, URLPart);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206333 => 206334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-23 22:24:27 UTC (rev 206333)
+++ trunk/Tools/ChangeLog 2016-09-23 22:32:28 UTC (rev 206334)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-23 Alex Christensen <achristensen@webkit.org>
+
+ Refactor URLParser
+ https://bugs.webkit.org/show_bug.cgi?id=162516
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2016-09-23 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Implement parsing of Async Functions
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (206333 => 206334)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-23 22:24:27 UTC (rev 206333)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-23 22:32:28 UTC (rev 206334)
</span><span class="lines">@@ -409,6 +409,9 @@
</span><span class="cx"> checkURLDifferences("http://[0:0:f:0:0:f:0:0]",
</span><span class="cx"> {"http", "", "", "[::f:0:0:f:0:0]", 0, "/", "", "", "http://[::f:0:0:f:0:0]/"},
</span><span class="cx"> {"http", "", "", "[0:0:f:0:0:f:0:0]", 0, "/", "", "", "http://[0:0:f:0:0:f:0:0]/"});
</span><ins>+ checkURLDifferences("http://[a:0:0:0:b:c::d]",
+ {"http", "", "", "[a::b:c:0:d]", 0, "/", "", "", "http://[a::b:c:0:d]/"},
+ {"http", "", "", "[a:0:0:0:b:c::d]", 0, "/", "", "", "http://[a:0:0:0:b:c::d]/"});
</ins><span class="cx"> checkURLDifferences("http://example.com/path1/.%2e",
</span><span class="cx"> {"http", "", "", "example.com", 0, "/", "", "", "http://example.com/"},
</span><span class="cx"> {"http", "", "", "example.com", 0, "/path1/.%2e", "", "", "http://example.com/path1/.%2e"});
</span><span class="lines">@@ -584,6 +587,9 @@
</span><span class="cx"> checkURLDifferences(wideString(L"http://host?Ćš#Ćš"),
</span><span class="cx"> {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", wideString(L"Ćš"), wideString(L"http://host/?%C3%9F%F0%9F%98%8D#Ćš")},
</span><span class="cx"> {"http", "", "", "host", 0, "/", "%C3%9F%F0%9F%98%8D", "%C3%9F%F0%9F%98%8D", "http://host/?%C3%9F%F0%9F%98%8D#%C3%9F%F0%9F%98%8D"});
</span><ins>+ checkURLDifferences(wideString(L"http://host/path#š©\tš©"),
+ {"http", "", "", "host", 0, "/path", "", wideString(L"š©š©"), wideString(L"http://host/path#š©š©")},
+ {"http", "", "", "host", 0, "/path", "", "%F0%9F%92%A9%F0%9F%92%A9", "http://host/path#%F0%9F%92%A9%F0%9F%92%A9"});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(URLParserTest, DefaultPort)
</span><span class="lines">@@ -670,9 +676,6 @@
</span><span class="cx"> checkURLDifferences("http://host/`",
</span><span class="cx"> {"http", "", "", "host", 0, "/%60", "", "", "http://host/%60"},
</span><span class="cx"> {"http", "", "", "host", 0, "/`", "", "", "http://host/`"});
</span><del>- checkURLDifferences(wideString(L"http://host/path#š©\tš©"),
- {"http", "", "", "host", 0, "/path", "", wideString(L"š©š©"), wideString(L"http://host/path#š©š©")},
- {"http", "", "", "host", 0, "/path", "", "%F0%9F%92%A9%F0%9F%92%A9", "http://host/path#%F0%9F%92%A9%F0%9F%92%A9"});
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void shouldFail(const String& urlString)
</span></span></pre>
</div>
</div>
</body>
</html>