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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

Issue 1419143008: Revert of Parse outline shorthand in CSSPropertyParser with CSSParserTokens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index c950d18cfd67fe13205178486dd22fef3104b2b3..304d82fbd3b8b1c4e6423f95f2c05fca79e6325e 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -1503,23 +1503,6 @@
if (!list->length())
return nullptr;
return list.release();
-}
-
-static PassRefPtrWillBeRawPtr<CSSValue> consumeOutlineColor(CSSParserTokenRange& range, const CSSParserContext& context)
-{
- // Outline color has "invert" as additional keyword.
- // Also, we want to allow the special focus color even in HTML Standard parsing mode.
- if (range.peek().id() == CSSValueInvert || range.peek().id() == CSSValueWebkitFocusRingColor)
- return consumeIdent(range);
- return consumeColor(range, context);
-}
-
-static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeLineWidth(CSSParserTokenRange& range, CSSParserMode cssParserMode)
-{
- CSSValueID id = range.peek().id();
- if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
- return consumeIdent(range);
- return consumeLength(range, cssParserMode, ValueRangeNonNegative);
}
PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID unresolvedProperty)
@@ -1638,12 +1621,6 @@
case CSSPropertyWebkitTextDecorationsInEffect:
case CSSPropertyTextDecorationLine:
return consumeTextDecorationLine(m_range);
- case CSSPropertyOutlineColor:
- return consumeOutlineColor(m_range, m_context);
- case CSSPropertyOutlineOffset:
- return consumeLength(m_range, m_context.mode(), ValueRangeAll);
- case CSSPropertyOutlineWidth:
- return consumeLineWidth(m_range, m_context.mode());
default:
return nullptr;
}
@@ -2115,8 +2092,6 @@
addProperty(CSSPropertyTextDecoration, textDecoration.release(), important);
return true;
}
- case CSSPropertyOutline:
- return consumeShorthandGreedily(outlineShorthand(), important);
default:
m_currentShorthand = oldShorthand;
return false;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698