<!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>[179532] trunk/Source</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/179532">179532</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-02 18:22:07 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize matchesLangPseudoClass() of :lang()
https://bugs.webkit.org/show_bug.cgi?id=140873
Patch by Dhi Aurrahman <diorahman@rockybars.com> on 2015-02-02
Reviewed by Darin Adler.
Source/WebCore:
Avoid unnecessary memory allocation.
No new tests, no behavior changed.
* css/SelectorCheckerTestFunctions.h:
(WebCore::equalIgnoringASCIICase):
(WebCore::containslanguageSubtagMatchingRange):
(WebCore::matchesLangPseudoClass):
Source/WTF:
Add some basic equality comparison operators.
* wtf/text/StringView.h:
(WTF::operator==):
(WTF::operator!=):
(WTF::equal):
(WTF::equalIgnoringASCIICase):</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="#trunkSourceWebCorecssSelectorCheckerTestFunctionsh">trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (179531 => 179532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-02-03 01:47:11 UTC (rev 179531)
+++ trunk/Source/WTF/ChangeLog 2015-02-03 02:22:07 UTC (rev 179532)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-02 Dhi Aurrahman <diorahman@rockybars.com>
+
+ Optimize matchesLangPseudoClass() of :lang()
+ https://bugs.webkit.org/show_bug.cgi?id=140873
+
+ Reviewed by Darin Adler.
+
+ Add some basic equality comparison operators.
+
+ * wtf/text/StringView.h:
+ (WTF::operator==):
+ (WTF::operator!=):
+ (WTF::equal):
+ (WTF::equalIgnoringASCIICase):
+
</ins><span class="cx"> 2015-02-02 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (179531 => 179532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2015-02-03 01:47:11 UTC (rev 179531)
+++ trunk/Source/WTF/wtf/text/StringView.h 2015-02-03 02:22:07 UTC (rev 179532)
</span><span class="lines">@@ -139,6 +139,23 @@
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType, size_t inlineCapacity> void append(Vector<CharacterType, inlineCapacity>&, StringView);
</span><span class="cx">
</span><ins>+bool equal(StringView, StringView);
+bool equal(StringView, const LChar*);
+bool equal(StringView, const char*);
+bool equalIgnoringASCIICase(StringView, StringView);
+
+inline bool operator==(StringView a, StringView b) { return equal(a, b); }
+inline bool operator==(StringView a, const LChar* b) { return equal(a, b); }
+inline bool operator==(StringView a, const char* b) { return equal(a, b); }
+inline bool operator==(const LChar* a, StringView b) { return equal(b, a); }
+inline bool operator==(const char* a, StringView b) { return equal(b, a); }
+
+inline bool operator!=(StringView a, StringView b) { return !equal(a, b); }
+inline bool operator!=(StringView a, const LChar* b) { return !equal(a, b); }
+inline bool operator!=(StringView a, const char* b) { return !equal(a, b); }
+inline bool operator!=(const LChar* a, StringView b) { return !equal(b, a); }
+inline bool operator!=(const char* a, StringView b) { return !equal(b, a); }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -449,6 +466,55 @@
</span><span class="cx"> string.getCharactersWithUpconvert(buffer.data() + oldSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool equal(StringView a, StringView b)
+{
+ unsigned aLength = a.length();
+ unsigned bLength = b.length();
+ if (aLength != bLength)
+ return false;
+
+ if (a.is8Bit()) {
+ if (b.is8Bit())
+ return equal(a.characters8(), b.characters8(), aLength);
+
+ return equal(a.characters8(), b.characters16(), aLength);
+ }
+
+ if (b.is8Bit())
+ return equal(a.characters16(), b.characters8(), aLength);
+
+ return equal(a.characters16(), b.characters16(), aLength);
+}
+
+inline bool equal(StringView a, const LChar* b)
+{
+ if (!b)
+ return !a.isEmpty();
+ if (a.isEmpty())
+ return !b;
+ unsigned aLength = a.length();
+ if (a.is8Bit())
+ return equal(a.characters8(), b, aLength);
+ return equal(a.characters16(), b, aLength);
+}
+
+inline bool equal(StringView a, const char* b)
+{
+ return equal(a, reinterpret_cast<const LChar*>(b));
+}
+
+inline bool equalIgnoringASCIICase(StringView a, StringView b)
+{
+ unsigned aLength = a.length();
+ if (aLength != b.length())
+ return false;
+ for (size_t i = 0; i < aLength; ++i) {
+ if (toASCIILower(a[i]) != toASCIILower(b[i]))
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> class StringView::CodePoints {
</span><span class="cx"> public:
</span><span class="cx"> explicit CodePoints(const StringView&);
</span><span class="lines">@@ -619,6 +685,7 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::append;
</span><ins>+using WTF::equal;
</ins><span class="cx"> using WTF::StringView;
</span><span class="cx">
</span><span class="cx"> #endif // StringView_h
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179531 => 179532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-03 01:47:11 UTC (rev 179531)
+++ trunk/Source/WebCore/ChangeLog 2015-02-03 02:22:07 UTC (rev 179532)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-02 Dhi Aurrahman <diorahman@rockybars.com>
+
+ Optimize matchesLangPseudoClass() of :lang()
+ https://bugs.webkit.org/show_bug.cgi?id=140873
+
+ Reviewed by Darin Adler.
+
+ Avoid unnecessary memory allocation.
+
+ No new tests, no behavior changed.
+
+ * css/SelectorCheckerTestFunctions.h:
+ (WebCore::equalIgnoringASCIICase):
+ (WebCore::containslanguageSubtagMatchingRange):
+ (WebCore::matchesLangPseudoClass):
+
</ins><span class="cx"> 2015-02-02 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGL2: Implement spec section 3.7.1 Setting and getting state (Part 2).
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerTestFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h (179531 => 179532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2015-02-03 01:47:11 UTC (rev 179531)
+++ trunk/Source/WebCore/css/SelectorCheckerTestFunctions.h 2015-02-03 02:22:07 UTC (rev 179532)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SELECTORS_LEVEL4)
</span><del>-inline bool equalIgnoringASCIICase(const String& a, const String& b)
</del><ins>+ALWAYS_INLINE bool equalIgnoringASCIICase(const String& a, const String& b)
</ins><span class="cx"> {
</span><span class="cx"> if (a.length() != b.length())
</span><span class="cx"> return false;
</span><span class="lines">@@ -132,21 +132,37 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool containslanguageSubtagMatchingRange(const Vector<String>& languageSubtags, const String& range, size_t& position)
</del><ins>+ALWAYS_INLINE bool containslanguageSubtagMatchingRange(StringView language, StringView range, unsigned languageLength, unsigned& position)
</ins><span class="cx"> {
</span><del>- for (size_t languageSubtagIndex = position; languageSubtagIndex < languageSubtags.size(); ++languageSubtagIndex) {
- const String& currentLanguageSubtag = languageSubtags[languageSubtagIndex];
- if (currentLanguageSubtag.length() == 1 && range != "*")
</del><ins>+ unsigned languageSubtagsStartIndex = position;
+ unsigned languageSubtagsEndIndex = languageLength;
+ bool isAsteriskRange = range == "*";
+ do {
+ if (languageSubtagsStartIndex > 0)
+ languageSubtagsStartIndex += 1;
+
+ languageSubtagsEndIndex = std::min<unsigned>(language.find('-', languageSubtagsStartIndex), languageLength);
+
+ if (languageSubtagsStartIndex > languageSubtagsEndIndex)
</ins><span class="cx"> return false;
</span><del>- if (equalIgnoringASCIICase(range, currentLanguageSubtag) || range == "*") {
- position = languageSubtagIndex + 1;
</del><ins>+
+ StringView languageSubtag = language.substring(languageSubtagsStartIndex, languageSubtagsEndIndex - languageSubtagsStartIndex);
+ bool isEqual = equalIgnoringASCIICase(range, languageSubtag);
+ if (!isAsteriskRange) {
+ if ((!isEqual && !languageSubtagsStartIndex) || (languageSubtag.length() == 1 && languageSubtagsStartIndex > 0))
+ return false;
+ }
+ languageSubtagsStartIndex = languageSubtagsEndIndex;
+ if (isEqual || isAsteriskRange) {
+ position = languageSubtagsStartIndex;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- }
</del><ins>+
+ } while (languageSubtagsStartIndex < languageLength);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool matchesLangPseudoClass(const Element* element, const Vector<LanguageArgument>& argumentList)
</del><ins>+ALWAYS_INLINE bool matchesLangPseudoClass(const Element* element, const Vector<LanguageArgument>& argumentList)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(element);
</span><span class="cx">
</span><span class="lines">@@ -163,11 +179,16 @@
</span><span class="cx">
</span><span class="cx"> // Implement basic and extended filterings of given language tags
</span><span class="cx"> // as specified in www.ietf.org/rfc/rfc4647.txt.
</span><del>- Vector<String> rangeSubtags;
- Vector<String> languageSubtags;
</del><ins>+ StringView languageStringView = language.string();
+ unsigned languageLength = language.length();
+ for (const LanguageArgument& argument : argumentList) {
+ const AtomicString& range = argument.languageRange;
+ if (range.isEmpty())
+ continue;
+ if (range == "*")
+ return true;
+ }
</ins><span class="cx">
</span><del>- language.string().split('-', true, languageSubtags);
-
</del><span class="cx"> for (const LanguageArgument& argument : argumentList) {
</span><span class="cx"> const AtomicString& range = argument.languageRange;
</span><span class="cx"> if (range.isEmpty())
</span><span class="lines">@@ -176,26 +197,29 @@
</span><span class="cx"> if (range == "*")
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (equalIgnoringASCIICase(language, range) && !language.contains('-'))
</del><ins>+ StringView rangeStringView = range.string();
+ if (equalIgnoringASCIICase(languageStringView, rangeStringView) && !languageStringView.contains('-'))
</ins><span class="cx"> return true;
</span><ins>+
+ unsigned rangeLength = rangeStringView.length();
+ unsigned rangeSubtagsStartIndex = 0;
+ unsigned rangeSubtagsEndIndex = rangeLength;
+ unsigned lastMatchedLanguageSubtagIndex = 0;
</ins><span class="cx">
</span><del>- range.string().split('-', true, rangeSubtags);
-
- if (rangeSubtags.size() > languageSubtags.size())
- continue;
-
- const String& firstRangeSubtag = rangeSubtags.first();
- if (!equalIgnoringASCIICase(firstRangeSubtag, languageSubtags.first()) && firstRangeSubtag != "*")
- continue;
-
- size_t lastMatchedLanguageSubtagIndex = 1;
</del><span class="cx"> bool matchedRange = true;
</span><del>- for (size_t rangeSubtagIndex = 1; rangeSubtagIndex < rangeSubtags.size(); ++rangeSubtagIndex) {
- if (!containslanguageSubtagMatchingRange(languageSubtags, rangeSubtags[rangeSubtagIndex], lastMatchedLanguageSubtagIndex)) {
</del><ins>+ do {
+ if (rangeSubtagsStartIndex > 0)
+ rangeSubtagsStartIndex += 1;
+ if (rangeSubtagsStartIndex > languageLength)
+ return false;
+ rangeSubtagsEndIndex = std::min<unsigned>(rangeStringView.find('-', rangeSubtagsStartIndex), rangeLength);
+ StringView rangeSubtag = rangeStringView.substring(rangeSubtagsStartIndex, rangeSubtagsEndIndex - rangeSubtagsStartIndex);
+ if (!containslanguageSubtagMatchingRange(languageStringView, rangeSubtag, languageLength, lastMatchedLanguageSubtagIndex)) {
</ins><span class="cx"> matchedRange = false;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- }
</del><ins>+ rangeSubtagsStartIndex = rangeSubtagsEndIndex;
+ } while (rangeSubtagsStartIndex < rangeLength);
</ins><span class="cx"> if (matchedRange)
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>