Source/core/css/parser/CSSPropertyParser.h - Issue 150333003: Expand the "font" shorthand when specified using a system font keyword.

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

Issue 150333003: Expand the "font" shorthand when specified using a system font keyword. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Assert the value list size and check it before calling parseKeywordBasedFont() Created 6 years, 9 months 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 | Annotate | Revision Log

« no previous file with comments | « LayoutTests/fast/css/font-shorthand-keywords-expected.txt ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

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 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
170	170

171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValu eList* args);	171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeRectangle(CSSParserValu eList* args);

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

173 PassRefPtrWillBeRawPtr<CSSBasicShape> parseDeprecatedBasicShapeCircle(CSSPar serValueList* args);	173 PassRefPtrWillBeRawPtr<CSSBasicShape> parseDeprecatedBasicShapeCircle(CSSPar serValueList* args);

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

175 PassRefPtrWillBeRawPtr<CSSBasicShape> parseDeprecatedBasicShapeEllipse(CSSPa rserValueList*);	175 PassRefPtrWillBeRawPtr<CSSBasicShape> parseDeprecatedBasicShapeEllipse(CSSPa rserValueList*);

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

177 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInsetRectangle(CSSParse rValueList* args);	177 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInsetRectangle(CSSParse rValueList* args);

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

179	179

	180 bool parseKeywordBasedFont(bool important);

180 bool parseFont(bool important);	181 bool parseFont(bool important);

181 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();	182 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();

182	183

183 bool parseCounter(CSSPropertyID, int defaultValue, bool important);	184 bool parseCounter(CSSPropertyID, int defaultValue, bool important);

184 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);	185 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);

185	186

186 bool parseColorParameters(CSSParserValue, int colorValues, bool parseAlpha );	187 bool parseColorParameters(CSSParserValue, int colorValues, bool parseAlpha );

187 bool parseHSLParameters(CSSParserValue, double colorValues, bool parseAlph a);	188 bool parseHSLParameters(CSSParserValue, double colorValues, bool parseAlph a);

188 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0);	189 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0);

189 bool parseColorFromValue(CSSParserValue*, RGBA32&);	190 bool parseColorFromValue(CSSParserValue*, RGBA32&);

(...skipping 212 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
402 CSSPropertyID cssPropertyID(const CSSParserString&);	403 CSSPropertyID cssPropertyID(const CSSParserString&);

403 CSSPropertyID cssPropertyID(const String&);	404 CSSPropertyID cssPropertyID(const String&);

404 CSSValueID cssValueKeywordID(const CSSParserString&);	405 CSSValueID cssValueKeywordID(const CSSParserString&);

405	406

406 bool isKeywordPropertyID(CSSPropertyID);	407 bool isKeywordPropertyID(CSSPropertyID);

407 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&);	408 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&);

408	409

409 } // namespace WebCore	410 } // namespace WebCore

410	411

411 #endif // CSSPropertyParser_h	412 #endif // CSSPropertyParser_h

OLD	NEW