third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h - Issue 1363233002: Restrict font-family in @font-face to <family-name>

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

Issue 1363233002: Restrict font-family in @font-face to <family-name> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/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 170 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
181 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);	181 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseShapeRadius(CSSParserValue*);

182	182

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

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

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

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

187	187

188 bool parseFont(bool important);	188 bool parseFont(bool important);

189 bool parseSystemFont(bool important);	189 bool parseSystemFont(bool important);

190 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();	190 PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();

191 PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFamily();

192	191

193 PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);	192 PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);

194 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);	193 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);

195	194

196 bool parseColorParameters(const CSSParserValue, int colorValues, bool pars eAlpha);	195 bool parseColorParameters(const CSSParserValue, int colorValues, bool pars eAlpha);

197 bool parseHSLParameters(const CSSParserValue, double colorValues, bool par seAlpha);	196 bool parseHSLParameters(const CSSParserValue, double colorValues, bool par seAlpha);

198 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);	197 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseColor(const CSSParserValue*, bool acceptQuirkyColors = false);

199 bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyCo lors = false);	198 bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyCo lors = false);

200	199

201 bool acceptQuirkyColors(CSSPropertyID) const;	200 bool acceptQuirkyColors(CSSPropertyID) const;

(...skipping 172 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
374 bool m_implicitShorthand;	373 bool m_implicitShorthand;

375 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;	374 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;

376 };	375 };

377	376

378 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);	377 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);

379 CSSValueID cssValueKeywordID(const CSSParserString&);	378 CSSValueID cssValueKeywordID(const CSSParserString&);

380	379

381 } // namespace blink	380 } // namespace blink

382	381

383 #endif // CSSPropertyParser_h	382 #endif // CSSPropertyParser_h

OLD	NEW