- Revision
- 209314
- Author
- [email protected]
- Date
- 2016-12-04 16:35:34 -0800 (Sun, 04 Dec 2016)
Log Message
[CSS Parser] Eliminate in-place lowercasing in the parser.
https://bugs.webkit.org/show_bug.cgi?id=165368
Reviewed by Darin Adler.
Source/WebCore:
Replace the in-place lowercasing that the parser does with new
mechanisms. In-place lowercasing ruins serialization and doesn't
work on CSS parsed from static strings. It also has the side effect
of mutating strings passed in from _javascript_ like for querySelectorAll.
For class/id selectors, we now check if the string is lowercase or not.
If it contains uppercase ASCII characters, then we allocate the RareData
for the selector. RareData now has two fields instead of one for the value,
a matching value (all lowercase in quirks mode), and a serializing value (the
original string). Because this is done at the CSSSelector level, the old
parser has been patched as well for these cases.
In addition, in-place lowercasing was done for pseudo-elements, for
media query features, and for attr(). In all of these cases we do
lowercase converting by first checking if it's needed. Serialization will
not retain the original string in these cases, so we may want to revisit
these cases in the future and apply a solution similar to what we did for
selectors.
* css/CSSGrammar.y.in:
* css/CSSSelector.cpp:
(WebCore::CSSSelector::createRareData):
(WebCore::CSSSelector::selectorText):
(WebCore::CSSSelector::RareData::RareData):
(WebCore::CSSSelector::RareData::~RareData):
* css/CSSSelector.h:
(WebCore::CSSSelector::RareData::create):
(WebCore::CSSSelector::setValue):
(WebCore::CSSSelector::value):
(WebCore::CSSSelector::serializingValue):
* css/MediaQueryExp.cpp:
(WebCore::MediaQueryExpression::MediaQueryExpression):
* css/parser/CSSParserToken.cpp:
(WebCore::convertToASCIILowercaseInPlace): Deleted.
(WebCore::CSSParserToken::convertToASCIILowercaseInPlace): Deleted.
* css/parser/CSSParserToken.h:
* css/parser/CSSParserValues.h:
(WebCore::CSSParserSelector::setValue):
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeAttr):
* css/parser/CSSSelectorParser.cpp:
(WebCore::CSSSelectorParser::consumeId):
(WebCore::CSSSelectorParser::consumeClass):
(WebCore::CSSSelectorParser::consumePseudo):
* css/parser/MediaQueryParser.cpp:
(WebCore::MediaQueryParser::readFeature):
LayoutTests:
* fast/media/mq-pointer-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (209313 => 209314)
--- trunk/LayoutTests/ChangeLog 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/LayoutTests/ChangeLog 2016-12-05 00:35:34 UTC (rev 209314)
@@ -1,3 +1,12 @@
+2016-12-04 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Eliminate in-place lowercasing in the parser.
+ https://bugs.webkit.org/show_bug.cgi?id=165368
+
+ Reviewed by Darin Adler.
+
+ * fast/media/mq-pointer-expected.txt:
+
2016-12-04 Matt Baker <[email protected]>
Web Inspector: Assertion Failures breakpoint should respect global Breakpoints enabled setting
Modified: trunk/LayoutTests/fast/media/mq-pointer-expected.txt (209313 => 209314)
--- trunk/LayoutTests/fast/media/mq-pointer-expected.txt 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/LayoutTests/fast/media/mq-pointer-expected.txt 2016-12-05 00:35:34 UTC (rev 209314)
@@ -1,7 +1,7 @@
Test the (pointer) and (hover) media features. See Bug 87403 for details.
Query "(pointer)": true
-Query "(pointer)": true
+Query "(Pointer)": true
Query "(pointer:none)": false
Query "(pointer:coarse)": false
Query "(pointer:coARse)": false
Modified: trunk/Source/WebCore/ChangeLog (209313 => 209314)
--- trunk/Source/WebCore/ChangeLog 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/ChangeLog 2016-12-05 00:35:34 UTC (rev 209314)
@@ -1,3 +1,57 @@
+2016-12-04 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Eliminate in-place lowercasing in the parser.
+ https://bugs.webkit.org/show_bug.cgi?id=165368
+
+ Reviewed by Darin Adler.
+
+ Replace the in-place lowercasing that the parser does with new
+ mechanisms. In-place lowercasing ruins serialization and doesn't
+ work on CSS parsed from static strings. It also has the side effect
+ of mutating strings passed in from _javascript_ like for querySelectorAll.
+
+ For class/id selectors, we now check if the string is lowercase or not.
+ If it contains uppercase ASCII characters, then we allocate the RareData
+ for the selector. RareData now has two fields instead of one for the value,
+ a matching value (all lowercase in quirks mode), and a serializing value (the
+ original string). Because this is done at the CSSSelector level, the old
+ parser has been patched as well for these cases.
+
+ In addition, in-place lowercasing was done for pseudo-elements, for
+ media query features, and for attr(). In all of these cases we do
+ lowercase converting by first checking if it's needed. Serialization will
+ not retain the original string in these cases, so we may want to revisit
+ these cases in the future and apply a solution similar to what we did for
+ selectors.
+
+ * css/CSSGrammar.y.in:
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::createRareData):
+ (WebCore::CSSSelector::selectorText):
+ (WebCore::CSSSelector::RareData::RareData):
+ (WebCore::CSSSelector::RareData::~RareData):
+ * css/CSSSelector.h:
+ (WebCore::CSSSelector::RareData::create):
+ (WebCore::CSSSelector::setValue):
+ (WebCore::CSSSelector::value):
+ (WebCore::CSSSelector::serializingValue):
+ * css/MediaQueryExp.cpp:
+ (WebCore::MediaQueryExpression::MediaQueryExpression):
+ * css/parser/CSSParserToken.cpp:
+ (WebCore::convertToASCIILowercaseInPlace): Deleted.
+ (WebCore::CSSParserToken::convertToASCIILowercaseInPlace): Deleted.
+ * css/parser/CSSParserToken.h:
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserSelector::setValue):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeAttr):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::CSSSelectorParser::consumeId):
+ (WebCore::CSSSelectorParser::consumeClass):
+ (WebCore::CSSSelectorParser::consumePseudo):
+ * css/parser/MediaQueryParser.cpp:
+ (WebCore::MediaQueryParser::readFeature):
+
2016-12-04 Gyuyoung Kim <[email protected]>
Fix a build break on EFL since r209303.
Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (209313 => 209314)
--- trunk/Source/WebCore/css/CSSGrammar.y.in 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2016-12-05 00:35:34 UTC (rev 209314)
@@ -1214,9 +1214,7 @@
IDSEL {
$$ = new CSSParserSelector;
$$->setMatch(CSSSelector::Id);
- if (parser->m_context.mode == HTMLQuirksMode)
- $1.convertToASCIILowercaseInPlace();
- $$->setValue($1);
+ $$->setValue($1, parser->m_context.mode == HTMLQuirksMode);
}
| HEX {
if ($1[0] >= '0' && $1[0] <= '9')
@@ -1224,9 +1222,7 @@
else {
$$ = new CSSParserSelector;
$$->setMatch(CSSSelector::Id);
- if (parser->m_context.mode == HTMLQuirksMode)
- $1.convertToASCIILowercaseInPlace();
- $$->setValue($1);
+ $$->setValue($1, parser->m_context.mode == HTMLQuirksMode);
}
}
| class
@@ -1238,9 +1234,7 @@
'.' IDENT {
$$ = new CSSParserSelector;
$$->setMatch(CSSSelector::Class);
- if (parser->m_context.mode == HTMLQuirksMode)
- $2.convertToASCIILowercaseInPlace();
- $$->setValue($2);
+ $$->setValue($2, parser->m_context.mode == HTMLQuirksMode);
}
;
Modified: trunk/Source/WebCore/css/CSSSelector.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/CSSSelector.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -84,7 +84,8 @@
if (m_hasRareData)
return;
// Move the value to the rare data stucture.
- m_data.m_rareData = &RareData::create(adoptRef(m_data.m_value)).leakRef();
+ AtomicString value { adoptRef(m_data.m_value) };
+ m_data.m_rareData = &RareData::create(WTFMove(value)).leakRef();
m_hasRareData = true;
}
@@ -406,10 +407,10 @@
while (true) {
if (cs->match() == CSSSelector::Id) {
str.append('#');
- serializeIdentifier(cs->value(), str);
+ serializeIdentifier(cs->serializingValue(), str);
} else if (cs->match() == CSSSelector::Class) {
str.append('.');
- serializeIdentifier(cs->value(), str);
+ serializeIdentifier(cs->serializingValue(), str);
} else if (cs->match() == CSSSelector::PseudoClass) {
switch (cs->pseudoClassType()) {
#if ENABLE(FULLSCREEN_API)
@@ -659,7 +660,7 @@
break;
default:
str.appendLiteral("::");
- str.append(cs->value());
+ str.append(cs->serializingValue());
}
} else if (cs->isAttributeSelector()) {
str.append('[');
@@ -696,7 +697,7 @@
break;
}
if (cs->match() != CSSSelector::Set) {
- serializeString(cs->value(), str);
+ serializeString(cs->serializingValue(), str);
if (cs->attributeValueMatchingIsCaseInsensitive())
str.appendLiteral(" i]");
else
@@ -820,8 +821,9 @@
return m_data.m_rareData->m_b;
}
-CSSSelector::RareData::RareData(PassRefPtr<AtomicStringImpl> value)
- : m_value(value.leakRef())
+CSSSelector::RareData::RareData(AtomicString&& value)
+ : m_matchingValue(value)
+ , m_serializingValue(value)
, m_a(0)
, m_b(0)
, m_attribute(anyQName())
@@ -831,8 +833,6 @@
CSSSelector::RareData::~RareData()
{
- if (m_value)
- m_value->deref();
}
// a helper function for parsing nth-arguments
Modified: trunk/Source/WebCore/css/CSSSelector.h (209313 => 209314)
--- trunk/Source/WebCore/css/CSSSelector.h 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/CSSSelector.h 2016-12-05 00:35:34 UTC (rev 209314)
@@ -233,6 +233,7 @@
const AtomicString& tagLowercaseLocalName() const;
const AtomicString& value() const;
+ const AtomicString& serializingValue() const;
const QualifiedName& attribute() const;
const AtomicString& attributeCanonicalLocalName() const;
const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
@@ -240,7 +241,7 @@
const Vector<AtomicString>* langArgumentList() const { return m_hasRareData ? m_data.m_rareData->m_langArgumentList.get() : nullptr; }
const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : nullptr; }
- void setValue(const AtomicString&);
+ void setValue(const AtomicString&, bool matchLowerCase = false);
// FIXME-NEWPARSER: These two methods can go away once the old parser is gone.
void setAttribute(const QualifiedName&, bool);
@@ -348,13 +349,18 @@
CSSSelector& operator=(const CSSSelector&);
struct RareData : public RefCounted<RareData> {
- static Ref<RareData> create(PassRefPtr<AtomicStringImpl> value) { return adoptRef(*new RareData(value)); }
+ static Ref<RareData> create(AtomicString&& value) { return adoptRef(*new RareData(WTFMove(value))); }
~RareData();
bool parseNth();
bool matchNth(int count);
- AtomicStringImpl* m_value; // Plain pointer to keep things uniform with the union.
+ // For quirks mode, class and id are case-insensitive. In the case where uppercase
+ // letters are used in quirks mode, |m_matchingValue| holds the lowercase class/id
+ // and |m_serializingValue| holds the original string.
+ AtomicString m_matchingValue;
+ AtomicString m_serializingValue;
+
int m_a; // Used for :nth-*
int m_b; // Used for :nth-*
QualifiedName m_attribute; // used for attribute selector
@@ -364,7 +370,7 @@
std::unique_ptr<CSSSelectorList> m_selectorList; // Used for :matches() and :not().
private:
- RareData(PassRefPtr<AtomicStringImpl> value);
+ RareData(AtomicString&& value);
};
void createRareData();
@@ -459,21 +465,24 @@
|| match() == CSSSelector::End;
}
-inline void CSSSelector::setValue(const AtomicString& value)
+inline void CSSSelector::setValue(const AtomicString& value, bool matchLowerCase)
{
ASSERT(match() != Tag);
+ AtomicString matchingValue = matchLowerCase ? value.convertToASCIILowercase() : value;
+ if (!m_hasRareData && matchingValue != value)
+ createRareData();
+
// Need to do ref counting manually for the union.
- if (m_hasRareData) {
- if (m_data.m_rareData->m_value)
- m_data.m_rareData->m_value->deref();
- m_data.m_rareData->m_value = value.impl();
- m_data.m_rareData->m_value->ref();
+ if (!m_hasRareData) {
+ if (m_data.m_value)
+ m_data.m_value->deref();
+ m_data.m_value = value.impl();
+ m_data.m_value->ref();
return;
}
- if (m_data.m_value)
- m_data.m_value->deref();
- m_data.m_value = value.impl();
- m_data.m_value->ref();
+
+ m_data.m_rareData->m_matchingValue = WTFMove(matchingValue);
+ m_data.m_rareData->m_serializingValue = value;
}
inline CSSSelector::CSSSelector()
@@ -567,11 +576,23 @@
inline const AtomicString& CSSSelector::value() const
{
ASSERT(match() != Tag);
+ if (m_hasRareData)
+ return m_data.m_rareData->m_matchingValue;
+
// AtomicString is really just an AtomicStringImpl* so the cast below is safe.
- // FIXME: Perhaps call sites could be changed to accept AtomicStringImpl?
- return *reinterpret_cast<const AtomicString*>(m_hasRareData ? &m_data.m_rareData->m_value : &m_data.m_value);
+ return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
}
+inline const AtomicString& CSSSelector::serializingValue() const
+{
+ ASSERT(match() != Tag);
+ if (m_hasRareData)
+ return m_data.m_rareData->m_serializingValue;
+
+ // AtomicString is really just an AtomicStringImpl* so the cast below is safe.
+ return *reinterpret_cast<const AtomicString*>(&m_data.m_value);
+}
+
inline void CSSSelector::setAttributeValueMatchingIsCaseInsensitive(bool isCaseInsensitive)
{
ASSERT(isAttributeSelector() && match() != CSSSelector::Set);
Modified: trunk/Source/WebCore/css/MediaQueryExp.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -289,7 +289,7 @@
}
MediaQueryExpression::MediaQueryExpression(const String& feature, const Vector<CSSParserToken, 4>& tokenList)
- : m_mediaFeature(feature)
+ : m_mediaFeature(feature.convertToASCIILowercase())
, m_isValid(false)
{
// Create value for media query _expression_ that must have 1 or more values.
Modified: trunk/Source/WebCore/css/parser/CSSParserToken.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -476,23 +476,4 @@
}
}
-template<typename CharacterType> ALWAYS_INLINE static void convertToASCIILowercaseInPlace(CharacterType* characters, unsigned length)
-{
- for (unsigned i = 0; i < length; ++i)
- characters[i] = toASCIILower(characters[i]);
-}
-
-// FIXME-NEWPARSER: Would like to get rid of this operation. Blink uses HTMLParser static lowercase
-// string hashing, but we don't have that code in our HTMLParser.
-void CSSParserToken::convertToASCIILowercaseInPlace()
-{
- if (!hasStringBacking())
- return;
-
- if (m_valueIs8Bit)
- WebCore::convertToASCIILowercaseInPlace(static_cast<LChar*>(m_valueDataCharRaw), m_valueLength);
- else
- WebCore::convertToASCIILowercaseInPlace(static_cast<UChar*>(m_valueDataCharRaw), m_valueLength);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/css/parser/CSSParserToken.h (209313 => 209314)
--- trunk/Source/WebCore/css/parser/CSSParserToken.h 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/CSSParserToken.h 2016-12-05 00:35:34 UTC (rev 209314)
@@ -121,8 +121,6 @@
return StringView(static_cast<const UChar*>(m_valueDataCharRaw), m_valueLength);
}
- void convertToASCIILowercaseInPlace();
-
UChar delimiter() const;
NumericSign numericSign() const;
NumericValueType numericValueType() const;
Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (209313 => 209314)
--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-12-05 00:35:34 UTC (rev 209314)
@@ -218,7 +218,7 @@
std::unique_ptr<CSSSelector> releaseSelector() { return WTFMove(m_selector); }
- void setValue(const AtomicString& value) { m_selector->setValue(value); }
+ void setValue(const AtomicString& value, bool matchLowerCase = false) { m_selector->setValue(value, matchLowerCase); }
// FIXME-NEWPARSER: These two methods can go away once old parser is gone.
void setAttribute(const QualifiedName& value, bool isCaseInsensitive) { m_selector->setAttribute(value, isCaseInsensitive); }
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -2122,10 +2122,10 @@
return nullptr;
CSSParserToken token = args.consumeIncludingWhitespace();
+ auto attrName = token.value().toAtomicString();
if (context.isHTMLDocument)
- token.convertToASCIILowercaseInPlace();
+ attrName = attrName.convertToASCIILowercase();
- String attrName = token.value().toString();
if (!args.atEnd())
return nullptr;
Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -389,10 +389,7 @@
// FIXME-NEWPARSER: Avoid having to do this, but the old parser does and we need
// to be compatible for now.
CSSParserToken token = range.consume();
- if (m_context.mode == HTMLQuirksMode)
- token.convertToASCIILowercaseInPlace();
- selector->setValue(token.value().toAtomicString());
-
+ selector->setValue(token.value().toAtomicString(), m_context.mode == HTMLQuirksMode);
return selector;
}
@@ -409,9 +406,7 @@
// FIXME-NEWPARSER: Avoid having to do this, but the old parser does and we need
// to be compatible for now.
CSSParserToken token = range.consume();
- if (m_context.mode == HTMLQuirksMode)
- token.convertToASCIILowercaseInPlace();
- selector->setValue(token.value().toAtomicString());
+ selector->setValue(token.value().toAtomicString(), m_context.mode == HTMLQuirksMode);
return selector;
}
@@ -512,19 +507,17 @@
std::unique_ptr<CSSParserSelector> selector;
- // FIXME-NEWPARSER: Would like to eliminate this.
- const_cast<CSSParserToken&>(token).convertToASCIILowercaseInPlace();
+ auto lowercasedValue = token.value().toString().convertToASCIILowercase();
+ auto value = StringView { lowercasedValue };
- StringView value = token.value();
-
// FIXME-NEWPARSER: We can't change the pseudoclass/element maps that the old parser
// uses without breaking it; this hack allows function selectors to work. When the new
// parser turns on, we can patch the map and remove this code.
String newValue;
if (token.type() == FunctionToken && colons == 1) {
- String tokenString = value.toString();
- if (!tokenString.startsWithIgnoringASCIICase("host")) {
- newValue = value.toString() + "(";
+ auto tokenString = value.toString();
+ if (!value.startsWithIgnoringASCIICase(StringView { "host" })) {
+ newValue = makeString(value, '(');
value = newValue;
}
}
Modified: trunk/Source/WebCore/css/parser/MediaQueryParser.cpp (209313 => 209314)
--- trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-04 22:47:02 UTC (rev 209313)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-05 00:35:34 UTC (rev 209314)
@@ -166,8 +166,6 @@
void MediaQueryParser::readFeature(CSSParserTokenType type, const CSSParserToken& token)
{
if (type == IdentToken) {
- // FIXME-NEWPARSER: Find a way to avoid this.
- const_cast<CSSParserToken&>(token).convertToASCIILowercaseInPlace();
m_mediaQueryData.setMediaFeature(token.value().toString());
m_state = ReadFeatureColon;
} else