Source/core/css/parser/CSSPropertyParser.h - Issue 677103002: Expand system font values during property parsing.

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.h

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: OVERRIDE -> override, Allow CSSValueNone in systemFont() Created 6 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 unified diff | Download patch

« Source/core/css/StylePropertyShorthandCustom.cpp ('K') | « Source/core/css/StylePropertyShorthandCustom.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | Source/core/rendering/RenderTheme.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)

3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.	3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.

4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>	4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>

5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d.	5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();	164 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();

165 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();	165 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();

166 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);	166 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);

167	167

168 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueLi st* args);	168 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueLi st* args);

169 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueL ist* args);	169 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueL ist* args);

170 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueL ist* args);	170 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueL ist* args);

171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueLis t* args);	171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueLis t* args);

172	172

173 bool parseFont(bool important);	173 bool parseFont(bool important);

	174 void parseSystemFont(bool important);

174 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();	175 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();

175	176

176 PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);	177 PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);

177 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);	178 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);

178	179

179 bool parseColorParameters(CSSParserValue, int colorValues, bool parseAlpha );	180 bool parseColorParameters(CSSParserValue, int colorValues, bool parseAlpha );

180 bool parseHSLParameters(CSSParserValue, double colorValues, bool parseAlph a);	181 bool parseHSLParameters(CSSParserValue, double colorValues, bool parseAlph a);

181 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0, bo ol acceptQuirkyColors = false);	182 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0, bo ol acceptQuirkyColors = false);

182 bool parseColorFromValue(CSSParserValue*, RGBA32&, bool acceptQuirkyColors = false);	183 bool parseColorFromValue(CSSParserValue*, RGBA32&, bool acceptQuirkyColors = false);

183	184

(...skipping 192 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
376 friend PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGradientColorOrKeyword (CSSPropertyParser, CSSParserValue);	377 friend PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGradientColorOrKeyword (CSSPropertyParser, CSSParserValue);

377 };	378 };

378	379

379 CSSPropertyID cssPropertyID(const CSSParserString&);	380 CSSPropertyID cssPropertyID(const CSSParserString&);

380 CSSPropertyID cssPropertyID(const String&);	381 CSSPropertyID cssPropertyID(const String&);

381 CSSValueID cssValueKeywordID(const CSSParserString&);	382 CSSValueID cssValueKeywordID(const CSSParserString&);

382	383

383 } // namespace blink	384 } // namespace blink

384	385

385 #endif // CSSPropertyParser_h	386 #endif // CSSPropertyParser_h

OLD	NEW