Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Unified Diff: Source/core/css/CSSSelector.cpp

Issue 330043003: Add support for case-insensitive attribute value selectors (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move zero-initialization of m_bits to RareData constructor (explicitly). Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/CSSSelector.cpp
diff --git a/Source/core/css/CSSSelector.cpp b/Source/core/css/CSSSelector.cpp
index c5c6f90232813e859929f930fea11af06b1ce0d2..b8295a09ab8a43dafd5cd53dabbab15e56f914d5 100644
--- a/Source/core/css/CSSSelector.cpp
+++ b/Source/core/css/CSSSelector.cpp
@@ -659,7 +659,7 @@ String CSSSelector::selectorText(const String& rightSide) const
const AtomicString& prefix = cs->attribute().prefix();
if (!prefix.isNull()) {
str.append(prefix);
- str.append("|");
+ str.append('|');
}
str.append(cs->attribute().localName());
switch (cs->m_match) {
@@ -690,6 +690,8 @@ String CSSSelector::selectorText(const String& rightSide) const
}
if (cs->m_match != CSSSelector::Set) {
serializeString(cs->value(), str);
+ if (cs->attributeMatchType() == CaseInsensitive)
+ str.appendLiteral(" i");
str.append(']');
}
}
@@ -719,10 +721,11 @@ String CSSSelector::selectorText(const String& rightSide) const
return str.toString() + rightSide;
}
-void CSSSelector::setAttribute(const QualifiedName& value)
+void CSSSelector::setAttribute(const QualifiedName& value, AttributeMatchType matchType)
{
createRareData();
m_data.m_rareData->m_attribute = value;
+ m_data.m_rareData->m_bits.m_attributeMatchType = matchType;
}
void CSSSelector::setArgument(const AtomicString& value)
@@ -826,8 +829,7 @@ bool CSSSelector::matchNth(int count) const
CSSSelector::RareData::RareData(const AtomicString& value)
: m_value(value)
- , m_a(0)
- , m_b(0)
+ , m_bits()
eseidel 2014/07/31 16:53:14 I still don't understand how this auto-initializes
ojan 2014/07/31 17:17:15 Yes.
, m_attribute(anyQName())
, m_argument(nullAtom)
{
@@ -845,55 +847,58 @@ bool CSSSelector::RareData::parseNth()
if (argument.isEmpty())
return false;
- m_a = 0;
- m_b = 0;
+ int nthA = 0;
+ int nthB = 0;
if (argument == "odd") {
- m_a = 2;
- m_b = 1;
+ nthA = 2;
+ nthB = 1;
} else if (argument == "even") {
- m_a = 2;
- m_b = 0;
+ nthA = 2;
+ nthB = 0;
} else {
size_t n = argument.find('n');
if (n != kNotFound) {
if (argument[0] == '-') {
if (n == 1)
- m_a = -1; // -n == -1n
+ nthA = -1; // -n == -1n
else
- m_a = argument.substring(0, n).toInt();
- } else if (!n)
- m_a = 1; // n == 1n
- else
- m_a = argument.substring(0, n).toInt();
+ nthA = argument.substring(0, n).toInt();
+ } else if (!n) {
+ nthA = 1; // n == 1n
+ } else {
+ nthA = argument.substring(0, n).toInt();
+ }
size_t p = argument.find('+', n);
- if (p != kNotFound)
- m_b = argument.substring(p + 1, argument.length() - p - 1).toInt();
- else {
+ if (p != kNotFound) {
+ nthB = argument.substring(p + 1, argument.length() - p - 1).toInt();
+ } else {
p = argument.find('-', n);
if (p != kNotFound)
- m_b = -argument.substring(p + 1, argument.length() - p - 1).toInt();
+ nthB = -argument.substring(p + 1, argument.length() - p - 1).toInt();
}
- } else
- m_b = argument.toInt();
+ } else {
+ nthB = argument.toInt();
+ }
}
+ setNthAValue(nthA);
+ setNthBValue(nthB);
return true;
}
// a helper function for checking nth-arguments
bool CSSSelector::RareData::matchNth(int count)
{
- if (!m_a)
- return count == m_b;
- else if (m_a > 0) {
- if (count < m_b)
+ if (!nthAValue())
+ return count == nthBValue();
+ if (nthAValue() > 0) {
+ if (count < nthBValue())
return false;
- return (count - m_b) % m_a == 0;
- } else {
- if (count > m_b)
- return false;
- return (m_b - count) % (-m_a) == 0;
+ return (count - nthBValue()) % nthAValue() == 0;
}
+ if (count > nthBValue())
+ return false;
+ return (nthBValue() - count) % (-nthAValue()) == 0;
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698