<!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>[164965] trunk/Source/WebCore</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/164965">164965</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-02 19:24:58 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/164961">r164961</a>.
http://trac.webkit.org/changeset/164961
https://bugs.webkit.org/show_bug.cgi?id=129596
Caused many assertion failures (Requested by ap on #webkit).
* css/SelectorChecker.cpp:
(WebCore::attributeValueMatches):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueMatching):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164964 => 164965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-03 02:30:37 UTC (rev 164964)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 03:24:58 UTC (rev 164965)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-02 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r164961.
+ http://trac.webkit.org/changeset/164961
+ https://bugs.webkit.org/show_bug.cgi?id=129596
+
+ Caused many assertion failures (Requested by ap on #webkit).
+
+ * css/SelectorChecker.cpp:
+ (WebCore::attributeValueMatches):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueMatching):
+
</ins><span class="cx"> 2014-03-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Streamline use of TextIterator, cutting down includes and use of soon-to-be-deleted functions
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (164964 => 164965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2014-03-03 02:30:37 UTC (rev 164964)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2014-03-03 03:24:58 UTC (rev 164965)
</span><span class="lines">@@ -280,12 +280,10 @@
</span><span class="cx"> ASSERT(!value.isNull());
</span><span class="cx">
</span><span class="cx"> switch (match) {
</span><del>- case CSSSelector::Set:
- return true;
</del><span class="cx"> case CSSSelector::Exact:
</span><span class="cx"> if (caseSensitive ? selectorValue != value : !equalIgnoringCase(selectorValue, value))
</span><span class="cx"> return false;
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> case CSSSelector::List:
</span><span class="cx"> {
</span><span class="cx"> // Ignore empty selectors or selectors containing spaces
</span><span class="lines">@@ -306,20 +304,20 @@
</span><span class="cx"> // No match. Keep looking.
</span><span class="cx"> startSearchAt = foundPos + 1;
</span><span class="cx"> }
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx"> case CSSSelector::Contain:
</span><span class="cx"> if (!value.contains(selectorValue, caseSensitive) || selectorValue.isEmpty())
</span><span class="cx"> return false;
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> case CSSSelector::Begin:
</span><span class="cx"> if (!value.startsWith(selectorValue, caseSensitive) || selectorValue.isEmpty())
</span><span class="cx"> return false;
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> case CSSSelector::End:
</span><span class="cx"> if (!value.endsWith(selectorValue, caseSensitive) || selectorValue.isEmpty())
</span><span class="cx"> return false;
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> case CSSSelector::Hyphen:
</span><span class="cx"> if (value.length() < selectorValue.length())
</span><span class="cx"> return false;
</span><span class="lines">@@ -328,11 +326,14 @@
</span><span class="cx"> // It they start the same, check for exact match or following '-':
</span><span class="cx"> if (value.length() != selectorValue.length() && value[selectorValue.length()] != '-')
</span><span class="cx"> return false;
</span><del>- return true;
</del><ins>+ break;
+ case CSSSelector::PseudoClass:
+ case CSSSelector::PseudoElement:
</ins><span class="cx"> default:
</span><del>- ASSERT_NOT_REACHED();
- return false;
</del><ins>+ break;
</ins><span class="cx"> }
</span><ins>+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool anyAttributeMatches(Element* element, const CSSSelector* selector, const QualifiedName& selectorAttr, bool caseSensitive)
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (164964 => 164965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-03-03 02:30:37 UTC (rev 164964)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-03-03 03:24:58 UTC (rev 164965)
</span><span class="lines">@@ -175,7 +175,6 @@
</span><span class="cx"> void generateElementAttributeMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, Assembler::RegisterID decIndexRegister, const AttributeMatchingInfo& attributeInfo);
</span><span class="cx"> void generateElementAttributeValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AttributeMatchingInfo& attributeInfo);
</span><span class="cx"> void generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool caseSensitive);
</span><del>- void generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool caseSensitive, JSC::FunctionPtr caseSensitiveTest, JSC::FunctionPtr caseInsensitiveTest);
</del><span class="cx"> void generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch);
</span><span class="cx"> void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
</span><span class="cx"> void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</span><span class="lines">@@ -349,29 +348,19 @@
</span><span class="cx"> if (m_functionType == FunctionType::CannotCompile || m_functionType == FunctionType::CannotMatchAnything)
</span><span class="cx"> return;
</span><span class="cx"> break;
</span><del>- case CSSSelector::List:
- if (selector->value().contains(' ')) {
- m_functionType = FunctionType::CannotMatchAnything;
- return;
- }
- FALLTHROUGH;
- case CSSSelector::Begin:
- case CSSSelector::End:
- case CSSSelector::Contain:
- if (selector->value().isEmpty()) {
- m_functionType = FunctionType::CannotMatchAnything;
- return;
- }
- FALLTHROUGH;
</del><span class="cx"> case CSSSelector::Exact:
</span><del>- case CSSSelector::Hyphen:
</del><span class="cx"> fragment.attributes.append(AttributeMatchingInfo(selector, HTMLDocument::isCaseSensitiveAttribute(selector->attribute())));
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::Set:
</span><span class="cx"> fragment.attributes.append(AttributeMatchingInfo(selector, true));
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::Unknown:
</span><ins>+ case CSSSelector::List:
+ case CSSSelector::Hyphen:
</ins><span class="cx"> case CSSSelector::PseudoElement:
</span><ins>+ case CSSSelector::Contain:
+ case CSSSelector::Begin:
+ case CSSSelector::End:
</ins><span class="cx"> case CSSSelector::PagePseudoClass:
</span><span class="cx"> goto CannotHandleSelector;
</span><span class="cx"> }
</span><span class="lines">@@ -1192,112 +1181,17 @@
</span><span class="cx"> localFailureCases.linkTo(loopReEntry, &m_assembler);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-enum CaseSensitivity {
- CaseSensitive,
- CaseInsensitive
-};
-
-template<CaseSensitivity caseSensitivity>
-static bool attributeValueBeginsWith(const Attribute* attribute, AtomicStringImpl* expectedString)
-{
- AtomicStringImpl& valueImpl = *attribute->value().impl();
- if (caseSensitivity == CaseSensitive)
- return valueImpl.startsWith(expectedString);
- return valueImpl.startsWith(expectedString, false);
-}
-
-template<CaseSensitivity caseSensitivity>
-static bool attributeValueContains(const Attribute* attribute, AtomicStringImpl* expectedString)
-{
- AtomicStringImpl& valueImpl = *attribute->value().impl();
- if (caseSensitivity == CaseSensitive)
- return valueImpl.find(expectedString) != notFound;
- return valueImpl.findIgnoringCase(expectedString) != notFound;
-}
-
-template<CaseSensitivity caseSensitivity>
-static bool attributeValueEndsWith(const Attribute* attribute, AtomicStringImpl* expectedString)
-{
- AtomicStringImpl& valueImpl = *attribute->value().impl();
- if (caseSensitivity == CaseSensitive)
- return valueImpl.endsWith(expectedString);
- return valueImpl.endsWith(expectedString, false);
-}
-
-template<CaseSensitivity caseSensitivity>
-static bool attributeValueMatchHyphenRule(const Attribute* attribute, AtomicStringImpl* expectedString)
-{
- AtomicStringImpl& valueImpl = *attribute->value().impl();
- if (valueImpl.length() < expectedString->length())
- return false;
-
- bool valueStartsWithExpectedString;
- if (caseSensitivity == CaseSensitive)
- valueStartsWithExpectedString = valueImpl.startsWith(expectedString);
- else
- valueStartsWithExpectedString = valueImpl.startsWith(expectedString, false);
-
- if (!valueStartsWithExpectedString)
- return false;
-
- return valueImpl.length() == expectedString->length() || valueImpl[expectedString->length()] == '-';
-}
-
-template<CaseSensitivity caseSensitivity>
-static bool attributeValueSpaceSeparetedListContains(const Attribute* attribute, AtomicStringImpl* expectedString)
-{
- AtomicStringImpl& value = *attribute->value().impl();
-
- unsigned startSearchAt = 0;
- while (true) {
- size_t expectedStringPosition;
- if (caseSensitivity == CaseSensitive)
- expectedStringPosition = value.find(expectedString, startSearchAt);
- else
- expectedStringPosition = value.findIgnoringCase(expectedString, startSearchAt);
- if (expectedStringPosition == notFound)
- return false;
- if (!expectedStringPosition || value[expectedStringPosition - 1] == ' ') {
- unsigned positionAfterExpectedString = expectedStringPosition + expectedString->length();
- if (positionAfterExpectedString == value.length() || value[positionAfterExpectedString] == ' ')
- return true;
- }
- startSearchAt = expectedStringPosition + 1;
- }
- return false;
-}
-
</del><span class="cx"> void SelectorCodeGenerator::generateElementAttributeValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AttributeMatchingInfo& attributeInfo)
</span><span class="cx"> {
</span><span class="cx"> const CSSSelector& attributeSelector = attributeInfo.selector();
</span><ins>+ if (attributeSelector.m_match == CSSSelector::Set)
+ return;
+
</ins><span class="cx"> const AtomicString& expectedValue = attributeSelector.value();
</span><span class="cx"> ASSERT(!expectedValue.isNull());
</span><del>- bool defaultToCaseSensitiveValueMatch = attributeInfo.canDefaultToCaseSensitiveValueMatch();
</del><span class="cx">
</span><del>- switch (attributeSelector.m_match) {
- case CSSSelector::Begin:
- generateElementAttributeFunctionCallValueMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch, attributeValueBeginsWith<CaseSensitive>, attributeValueBeginsWith<CaseInsensitive>);
- break;
- case CSSSelector::Contain:
- generateElementAttributeFunctionCallValueMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch, attributeValueContains<CaseSensitive>, attributeValueContains<CaseInsensitive>);
- break;
- case CSSSelector::End:
- generateElementAttributeFunctionCallValueMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch, attributeValueEndsWith<CaseSensitive>, attributeValueEndsWith<CaseInsensitive>);
- break;
- case CSSSelector::Exact:
- generateElementAttributeValueExactMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch);
- break;
- case CSSSelector::Hyphen:
- generateElementAttributeFunctionCallValueMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch, attributeValueMatchHyphenRule<CaseSensitive>, attributeValueMatchHyphenRule<CaseInsensitive>);
- break;
- case CSSSelector::List:
- generateElementAttributeFunctionCallValueMatching(failureCases, currentAttributeAddress, expectedValue, defaultToCaseSensitiveValueMatch, attributeValueSpaceSeparetedListContains<CaseSensitive>, attributeValueSpaceSeparetedListContains<CaseInsensitive>);
- break;
- case CSSSelector::Set:
- break;
- default:
- ASSERT_NOT_REACHED();
- }
</del><ins>+ RELEASE_ASSERT(attributeSelector.m_match == CSSSelector::Exact);
+ generateElementAttributeValueExactMatching(failureCases, currentAttributeAddress, expectedValue, attributeInfo.canDefaultToCaseSensitiveValueMatch());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline Assembler::Jump testIsHTMLClassOnDocument(Assembler::ResultCondition condition, Assembler& assembler, Assembler::RegisterID documentAddress)
</span><span class="lines">@@ -1341,49 +1235,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool canDefaultToCaseSensitiveValueMatch, JSC::FunctionPtr caseSensitiveTest, JSC::FunctionPtr caseInsensitiveTest)
-{
- LocalRegister expectedValueRegister(m_registerAllocator);
- m_assembler.move(Assembler::TrustedImmPtr(expectedValue.impl()), expectedValueRegister);
-
- if (canDefaultToCaseSensitiveValueMatch) {
- FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
- functionCall.setFunctionAddress(caseSensitiveTest);
- functionCall.setTwoArguments(currentAttributeAddress, expectedValueRegister);
- failureCases.append(functionCall.callAndBranchOnCondition(Assembler::Zero));
- } else {
- Assembler::JumpList shouldUseCaseSensitiveComparison;
- shouldUseCaseSensitiveComparison.append(testIsHTMLFlagOnNode(Assembler::Zero, m_assembler, elementAddressRegister));
- {
- LocalRegister scratchRegister(m_registerAllocator);
- // scratchRegister = pointer to treeScope.
- m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Node::treeScopeMemoryOffset()), scratchRegister);
- // scratchRegister = pointer to document.
- m_assembler.loadPtr(Assembler::Address(scratchRegister, TreeScope::documentScopeMemoryOffset()), scratchRegister);
- shouldUseCaseSensitiveComparison.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, scratchRegister));
- }
-
- {
- FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
- functionCall.setFunctionAddress(caseInsensitiveTest);
- functionCall.setTwoArguments(currentAttributeAddress, expectedValueRegister);
- failureCases.append(functionCall.callAndBranchOnCondition(Assembler::Zero));
- }
-
- Assembler::Jump skipCaseSensitiveCase = m_assembler.jump();
-
- {
- shouldUseCaseSensitiveComparison.link(&m_assembler);
- FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
- functionCall.setFunctionAddress(caseSensitiveTest);
- functionCall.setTwoArguments(currentAttributeAddress, expectedValueRegister);
- failureCases.append(functionCall.callAndBranchOnCondition(Assembler::Zero));
- }
-
- skipCaseSensitiveCase.link(&m_assembler);
- }
-}
-
</del><span class="cx"> void SelectorCodeGenerator::generateElementFunctionCallTest(Assembler::JumpList& failureCases, JSC::FunctionPtr testFunction)
</span><span class="cx"> {
</span><span class="cx"> Assembler::RegisterID elementAddress = elementAddressRegister;
</span></span></pre>
</div>
</div>
</body>
</html>