<!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>[198019] 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/198019">198019</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-03-11 07:10:18 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WTF should have a similar function as equalLettersIgnoringASCIICase to match beginning of strings
https://bugs.webkit.org/show_bug.cgi?id=153419
Reviewed by Darin Adler.
Source/WebCore:
Covered by added unint tests.
* Modules/fetch/FetchHeaders.cpp:
(WebCore::isForbiddenHeaderName): Using startsWithLettersIgnoringASCIICase.
Source/WTF:
Introducing startsWithLettersIgnoringASCIICase, to check the beginning of a string.
Moving some code from WTF::equalLettersIgnoringASCIICaseCommonWithoutLength in
WTF::hasPrefixWithLettersIgnoringASCIICaseCommon to enable reuse in
WTF::startsWithLettersIgnoringASCIICaseCommon.
* wtf/text/StringCommon.h:
(WTF::hasPrefixWithLettersIgnoringASCIICaseCommon):
(WTF::equalLettersIgnoringASCIICaseCommonWithoutLength):
(WTF::startsWithLettersIgnoringASCIICaseCommonWithoutLength):
(WTF::startsWithLettersIgnoringASCIICaseCommon):
* wtf/text/StringImpl.h:
(WTF::startsWithLettersIgnoringASCIICase):
* wtf/text/WTFString.h:
(WTF::startsWithLettersIgnoringASCIICase):
Tools:
* TestWebKitAPI/Tests/WTF/StringOperators.cpp:
(TestWebKitAPI::TEST): Adding test case for startsWithLettersIgnoringASCIICase.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringCommonh">trunk/Source/WTF/wtf/text/StringCommon.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchHeaderscpp">trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringImplcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WTF/ChangeLog 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WTF should have a similar function as equalLettersIgnoringASCIICase to match beginning of strings
+ https://bugs.webkit.org/show_bug.cgi?id=153419
+
+ Reviewed by Darin Adler.
+
+ Introducing startsWithLettersIgnoringASCIICase, to check the beginning of a string.
+ Moving some code from WTF::equalLettersIgnoringASCIICaseCommonWithoutLength in
+ WTF::hasPrefixWithLettersIgnoringASCIICaseCommon to enable reuse in
+ WTF::startsWithLettersIgnoringASCIICaseCommon.
+
+ * wtf/text/StringCommon.h:
+ (WTF::hasPrefixWithLettersIgnoringASCIICaseCommon):
+ (WTF::equalLettersIgnoringASCIICaseCommonWithoutLength):
+ (WTF::startsWithLettersIgnoringASCIICaseCommonWithoutLength):
+ (WTF::startsWithLettersIgnoringASCIICaseCommon):
+ * wtf/text/StringImpl.h:
+ (WTF::startsWithLettersIgnoringASCIICase):
+ * wtf/text/WTFString.h:
+ (WTF::startsWithLettersIgnoringASCIICase):
+
</ins><span class="cx"> 2016-03-10 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add support for WOFF2
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringCommon.h (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringCommon.h 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WTF/wtf/text/StringCommon.h 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -590,22 +590,39 @@
</span><span class="cx"> return charactersLength == lowercaseLettersStringLength && equalLettersIgnoringASCIICase(characters, lowercaseLetters, lowercaseLettersStringLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// This is intentionally not marked inline because it's used often and is not speed-critical enough to want it inlined everywhere.
-template<typename StringClass> bool equalLettersIgnoringASCIICaseCommonWithoutLength(const StringClass& string, const char* lowercaseLetters)
</del><ins>+template<typename StringClass> bool inline hasPrefixWithLettersIgnoringASCIICaseCommon(const StringClass& string, const char* lowercaseLetters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> ASSERT(*lowercaseLetters);
</span><span class="cx"> for (const char* letter = lowercaseLetters; *letter; ++letter)
</span><span class="cx"> ASSERT(toASCIILowerUnchecked(*letter) == *letter);
</span><span class="cx"> #endif
</span><del>- unsigned length = string.length();
- if (length != strlen(lowercaseLetters))
- return false;
</del><ins>+ ASSERT(string.length() >= length);
+
</ins><span class="cx"> if (string.is8Bit())
</span><span class="cx"> return equalLettersIgnoringASCIICase(string.characters8(), lowercaseLetters, length);
</span><span class="cx"> return equalLettersIgnoringASCIICase(string.characters16(), lowercaseLetters, length);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// This is intentionally not marked inline because it's used often and is not speed-critical enough to want it inlined everywhere.
+template<typename StringClass> bool equalLettersIgnoringASCIICaseCommonWithoutLength(const StringClass& string, const char* lowercaseLetters)
+{
+ unsigned length = string.length();
+ if (length != strlen(lowercaseLetters))
+ return false;
+ return hasPrefixWithLettersIgnoringASCIICaseCommon(string, lowercaseLetters, length);
+}
+
+template<typename StringClass> bool startsWithLettersIgnoringASCIICaseCommonWithoutLength(const StringClass& string, const char* lowercaseLetters)
+{
+ size_t prefixLength = strlen(lowercaseLetters);
+ if (!prefixLength)
+ return true;
+ if (string.length() < prefixLength)
+ return false;
+ return hasPrefixWithLettersIgnoringASCIICaseCommon(string, lowercaseLetters, prefixLength);
+}
+
</ins><span class="cx"> template<typename StringClass, unsigned length> inline bool equalLettersIgnoringASCIICaseCommon(const StringClass& string, const char (&lowercaseLetters)[length])
</span><span class="cx"> {
</span><span class="cx"> // Don't actually use the length; we are choosing code size over speed.
</span><span class="lines">@@ -614,8 +631,14 @@
</span><span class="cx"> return equalLettersIgnoringASCIICaseCommonWithoutLength(string, pointer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<typename StringClass, unsigned length> inline bool startsWithLettersIgnoringASCIICaseCommon(const StringClass& string, const char (&lowercaseLetters)[length])
+{
+ const char* pointer = lowercaseLetters;
+ return startsWithLettersIgnoringASCIICaseCommonWithoutLength(string, pointer);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> using WTF::equalIgnoringASCIICase;
</span><span class="cx"> using WTF::equalLettersIgnoringASCIICase;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -1181,6 +1181,16 @@
</span><span class="cx"> return a && equalIgnoringASCIICase(*a, b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<unsigned length> inline bool startsWithLettersIgnoringASCIICase(const StringImpl& string, const char (&lowercaseLetters)[length])
+{
+ return startsWithLettersIgnoringASCIICaseCommon(string, lowercaseLetters);
+}
+
+template<unsigned length> inline bool startsWithLettersIgnoringASCIICase(const StringImpl* string, const char (&lowercaseLetters)[length])
+{
+ return string && startsWithLettersIgnoringASCIICase(*string, lowercaseLetters);
+}
+
</ins><span class="cx"> template<unsigned length> inline bool equalLettersIgnoringASCIICase(const StringImpl& string, const char (&lowercaseLetters)[length])
</span><span class="cx"> {
</span><span class="cx"> return equalLettersIgnoringASCIICaseCommon(string, lowercaseLetters);
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -503,6 +503,7 @@
</span><span class="cx"> bool equalIgnoringASCIICase(const String&, const char*);
</span><span class="cx">
</span><span class="cx"> template<unsigned length> bool equalLettersIgnoringASCIICase(const String&, const char (&lowercaseLetters)[length]);
</span><ins>+template<unsigned length> bool startsWithLettersIgnoringASCIICase(const String&, const char (&lowercaseLetters)[length]);
</ins><span class="cx">
</span><span class="cx"> inline bool equalIgnoringNullity(const String& a, const String& b) { return equalIgnoringNullity(a.impl(), b.impl()); }
</span><span class="cx"> template<size_t inlineCapacity> inline bool equalIgnoringNullity(const Vector<UChar, inlineCapacity>& a, const String& b) { return equalIgnoringNullity(a, b.impl()); }
</span><span class="lines">@@ -726,8 +727,13 @@
</span><span class="cx"> return equalIgnoringASCIICase(a.impl(), b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<unsigned length> inline bool startsWithLettersIgnoringASCIICase(const String& string, const char (&lowercaseLetters)[length])
+{
+ return startsWithLettersIgnoringASCIICase(string.impl(), lowercaseLetters);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> using WTF::CString;
</span><span class="cx"> using WTF::KeepTrailingZeros;
</span><span class="cx"> using WTF::String;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WebCore/ChangeLog 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><ins>+ WTF should have a similar function as equalLettersIgnoringASCIICase to match beginning of strings
+ https://bugs.webkit.org/show_bug.cgi?id=153419
+
+ Reviewed by Darin Adler.
+
+ Covered by added unint tests.
+
+ * Modules/fetch/FetchHeaders.cpp:
+ (WebCore::isForbiddenHeaderName): Using startsWithLettersIgnoringASCIICase.
+
+2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
</ins><span class="cx"> [Fetch API] Use DeferredWrapper directly in FetchBody promise handling
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155291
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchHeaderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Source/WebCore/Modules/fetch/FetchHeaders.cpp 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return name.startsWithIgnoringASCIICase(ASCIILiteral("Sec-")) || name.startsWithIgnoringASCIICase(ASCIILiteral("Proxy-"));
</del><ins>+ return startsWithLettersIgnoringASCIICase(name, "sec-") || startsWithLettersIgnoringASCIICase(name, "proxy-");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isForbiddenResponseHeaderName(const String& name)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Tools/ChangeLog 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WTF should have a similar function as equalLettersIgnoringASCIICase to match beginning of strings
+ https://bugs.webkit.org/show_bug.cgi?id=153419
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WTF/StringOperators.cpp:
+ (TestWebKitAPI::TEST): Adding test case for startsWithLettersIgnoringASCIICase.
+
+
</ins><span class="cx"> 2016-03-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Font antialiasing (smoothing) changes when elements are rendered into compositing layers
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp (198018 => 198019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2016-03-11 14:45:14 UTC (rev 198018)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2016-03-11 15:10:18 UTC (rev 198019)
</span><span class="lines">@@ -424,6 +424,21 @@
</span><span class="cx"> ASSERT_FALSE(empty->startsWithIgnoringASCIICase(*reference.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF, StartsWithLettersIgnoringASCIICase)
+{
+ String string("Test tEST");
+ ASSERT_TRUE(startsWithLettersIgnoringASCIICase(string, "test t"));
+ ASSERT_TRUE(startsWithLettersIgnoringASCIICase(string, "test te"));
+ ASSERT_TRUE(startsWithLettersIgnoringASCIICase(string, "test test"));
+ ASSERT_FALSE(startsWithLettersIgnoringASCIICase(string, "test tex"));
+
+ ASSERT_TRUE(startsWithLettersIgnoringASCIICase(string, ""));
+ ASSERT_TRUE(startsWithLettersIgnoringASCIICase(String(""), ""));
+
+ ASSERT_FALSE(startsWithLettersIgnoringASCIICase(String(), "t"));
+ ASSERT_FALSE(startsWithLettersIgnoringASCIICase(String(), ""));
+}
+
</ins><span class="cx"> TEST(WTF, StringImplEndsWithIgnoringASCIICaseBasic)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StringImpl> reference = stringFromUTF8("XÉCbA");
</span></span></pre>
</div>
</div>
</body>
</html>