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

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

Issue 1529913002: Parse list-style shorthand in CSSPropertyParser with CSSParserTokens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: V2 Created 5 years 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/css/parser/CSSPropertyParser.h" 6 #include "core/css/parser/CSSPropertyParser.h"
7 7
8 #include "core/StylePropertyShorthand.h" 8 #include "core/StylePropertyShorthand.h"
9 #include "core/css/CSSCalculationValue.h" 9 #include "core/css/CSSCalculationValue.h"
10 #include "core/css/CSSCounterValue.h" 10 #include "core/css/CSSCounterValue.h"
(...skipping 3102 matching lines...) Expand 10 before | Expand all | Expand 10 after
3113 case CSSPropertyRy: 3113 case CSSPropertyRy:
3114 return consumeLengthOrPercent(m_range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Forbid); 3114 return consumeLengthOrPercent(m_range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Forbid);
3115 case CSSPropertyCursor: 3115 case CSSPropertyCursor:
3116 return consumeCursor(m_range, m_context, inQuirksMode()); 3116 return consumeCursor(m_range, m_context, inQuirksMode());
3117 case CSSPropertyContain: 3117 case CSSPropertyContain:
3118 return consumeContain(m_range); 3118 return consumeContain(m_range);
3119 case CSSPropertyTransformOrigin: 3119 case CSSPropertyTransformOrigin:
3120 return consumeTransformOrigin(m_range, m_context.mode(), UnitlessQuirk:: Forbid); 3120 return consumeTransformOrigin(m_range, m_context.mode(), UnitlessQuirk:: Forbid);
3121 case CSSPropertyContent: 3121 case CSSPropertyContent:
3122 return consumeContent(m_range, m_context); 3122 return consumeContent(m_range, m_context);
3123 case CSSPropertyListStyleImage:
3124 return consumeImage(m_range, m_context);
3123 default: 3125 default:
3124 return nullptr; 3126 return nullptr;
3125 } 3127 }
3126 } 3128 }
3127 3129
3128 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParse rTokenRange& range) 3130 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParse rTokenRange& range)
3129 { 3131 {
3130 RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated (); 3132 RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated ();
3131 3133
3132 do { 3134 do {
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
3703 addProperty(CSSPropertyMarkerMid, marker, important); 3705 addProperty(CSSPropertyMarkerMid, marker, important);
3704 addProperty(CSSPropertyMarkerEnd, marker.release(), important); 3706 addProperty(CSSPropertyMarkerEnd, marker.release(), important);
3705 return true; 3707 return true;
3706 } 3708 }
3707 case CSSPropertyFlex: 3709 case CSSPropertyFlex:
3708 return consumeFlex(important); 3710 return consumeFlex(important);
3709 case CSSPropertyFlexFlow: 3711 case CSSPropertyFlexFlow:
3710 return consumeShorthandGreedily(flexFlowShorthand(), important); 3712 return consumeShorthandGreedily(flexFlowShorthand(), important);
3711 case CSSPropertyWebkitColumnRule: 3713 case CSSPropertyWebkitColumnRule:
3712 return consumeShorthandGreedily(webkitColumnRuleShorthand(), important); 3714 return consumeShorthandGreedily(webkitColumnRuleShorthand(), important);
3715 case CSSPropertyListStyle:
3716 return consumeShorthandGreedily(listStyleShorthand(), important);
3713 default: 3717 default:
3714 m_currentShorthand = oldShorthand; 3718 m_currentShorthand = oldShorthand;
3715 return false; 3719 return false;
3716 } 3720 }
3717 } 3721 }
3718 3722
3719 } // namespace blink 3723 } // namespace blink
OLDNEW
« 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