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

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

Issue 1447173002: Parse marker shorthand in CSSPropertyParser with CSSParserTokens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove more cases 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 | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
index 660600315f5cbadba0baffee975cf96141f8bb33..3055b695e8a876fd53b649c47c5e6c364c333868 100644
--- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
@@ -1173,6 +1173,10 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
case CSSPropertyFloodColor:
case CSSPropertyLightingColor:
case CSSPropertyPaintOrder:
+ case CSSPropertyMarker:
+ case CSSPropertyMarkerStart:
+ case CSSPropertyMarkerMid:
+ case CSSPropertyMarkerEnd:
validPrimitive = false;
break;
@@ -5474,9 +5478,6 @@ bool CSSPropertyParser::parseSVGValue(CSSPropertyID propId, bool important)
case CSSPropertyClipPath:
case CSSPropertyFilter:
- case CSSPropertyMarkerStart:
- case CSSPropertyMarkerMid:
- case CSSPropertyMarkerEnd:
case CSSPropertyMask:
if (id == CSSValueNone) {
validPrimitive = true;
@@ -5520,21 +5521,6 @@ bool CSSPropertyParser::parseSVGValue(CSSPropertyID propId, bool important)
parsedValue = parseSVGStrokeDasharray();
break;
- /* shorthand properties */
- case CSSPropertyMarker: {
- ShorthandScope scope(this, propId);
- CSSPropertyParser::ImplicitScope implicitScope(this);
- if (!parseValue(CSSPropertyMarkerStart, important))
- return false;
- if (m_valueList->current()) {
- rollbackLastProperties(1);
- return false;
- }
- CSSValue* value = m_parsedProperties.last().value();
- addProperty(CSSPropertyMarkerMid, value, important);
- addProperty(CSSPropertyMarkerEnd, value, important);
- return true;
- }
default:
// If you crash here, it's because you added a css property and are not handling it
// in either this switch statement or the one in CSSPropertyParser::parseValue
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698