Index: Source/core/css/CSSParser-in.cpp |
diff --git a/Source/core/css/CSSParser-in.cpp b/Source/core/css/CSSParser-in.cpp |
index 16a4e61097dee70ace1149b6449dc5ef9f404036..d75e9694b2a97a876b9867401d7c176081731863 100644 |
--- a/Source/core/css/CSSParser-in.cpp |
+++ b/Source/core/css/CSSParser-in.cpp |
@@ -8769,7 +8769,7 @@ bool CSSParser::parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& prop |
void CSSParser::addTextDecorationProperty(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important) |
{ |
// The text-decoration-line property takes priority over text-decoration, unless the latter has important priority set. |
- if (propId == CSSPropertyTextDecoration && !important && m_currentShorthand == CSSPropertyInvalid) { |
+ if (propId == CSSPropertyTextDecoration && !important && !inShorthand()) { |
for (unsigned i = 0; i < m_parsedProperties.size(); ++i) { |
if (m_parsedProperties[i].id() == CSSPropertyTextDecorationLine) |
return; |
@@ -8785,7 +8785,7 @@ bool CSSParser::parseTextDecoration(CSSPropertyID propId, bool important) |
return false; |
CSSParserValue* value = m_valueList->current(); |
- if (value->id == CSSValueNone) { |
+ if (value && value->id == CSSValueNone) { |
Julien - ping for review
2013/07/24 20:57:28
As said on IRC, it would have been better to keep
|
addTextDecorationProperty(propId, cssValuePool().createIdentifierValue(CSSValueNone), important); |
m_valueList->next(); |
return true; |