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

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

Issue 205743004: Expand system font values during font property parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase and fix up unittest use of systemFont() 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
OLDNEW
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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox(); 167 PassRefPtrWillBeRawPtr<CSSValue> parseBasicShapeAndOrBox();
168 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape(); 168 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseBasicShape();
169 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*); 169 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);
170 170
171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueLi st* args); 171 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeCircle(CSSParserValueLi st* args);
172 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueL ist* args); 172 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeEllipse(CSSParserValueL ist* args);
173 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueL ist* args); 173 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapePolygon(CSSParserValueL ist* args);
174 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueLis t* args); 174 PassRefPtrWillBeRawPtr<CSSBasicShape> parseBasicShapeInset(CSSParserValueLis t* args);
175 175
176 bool parseFont(bool important); 176 bool parseFont(bool important);
177 void parseSystemFont(bool important);
177 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily(); 178 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();
178 179
179 bool parseCounter(CSSPropertyID, int defaultValue, bool important); 180 bool parseCounter(CSSPropertyID, int defaultValue, bool important);
180 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters); 181 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);
181 182
182 bool parseColorParameters(CSSParserValue*, int* colorValues, bool parseAlpha ); 183 bool parseColorParameters(CSSParserValue*, int* colorValues, bool parseAlpha );
183 bool parseHSLParameters(CSSParserValue*, double* colorValues, bool parseAlph a); 184 bool parseHSLParameters(CSSParserValue*, double* colorValues, bool parseAlph a);
184 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0); 185 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(CSSParserValue* = 0);
185 bool parseColorFromValue(CSSParserValue*, RGBA32&); 186 bool parseColorFromValue(CSSParserValue*, RGBA32&);
186 187
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 CSSPropertyID cssPropertyID(const CSSParserString&); 399 CSSPropertyID cssPropertyID(const CSSParserString&);
399 CSSPropertyID cssPropertyID(const String&); 400 CSSPropertyID cssPropertyID(const String&);
400 CSSValueID cssValueKeywordID(const CSSParserString&); 401 CSSValueID cssValueKeywordID(const CSSParserString&);
401 402
402 bool isKeywordPropertyID(CSSPropertyID); 403 bool isKeywordPropertyID(CSSPropertyID);
403 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&); 404 bool isValidKeywordPropertyAndValue(CSSPropertyID, int valueID, const CSSParserC ontext&);
404 405
405 } // namespace WebCore 406 } // namespace WebCore
406 407
407 #endif // CSSPropertyParser_h 408 #endif // CSSPropertyParser_h
OLDNEW
« no previous file with comments | « Source/core/css/StylePropertyShorthandCustom.cpp ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698