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

Unified Diff: Source/core/css/parser/CSSPropertyParser.h

Issue 1331233003: Move parseFontFaceDescriptor to CSSPropertyParser.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address review comments Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/css/parser/CSSPropertyParser.h
diff --git a/Source/core/css/parser/CSSPropertyParser.h b/Source/core/css/parser/CSSPropertyParser.h
index 9cb28f4c4872a24d2b6f2661721bf3c88234d1a9..f29ed6105726899537cba065bd51a165c149ea4e 100644
--- a/Source/core/css/parser/CSSPropertyParser.h
+++ b/Source/core/css/parser/CSSPropertyParser.h
@@ -187,6 +187,7 @@ private:
bool parseFont(bool important);
bool parseSystemFont(bool important);
PassRefPtrWillBeRawPtr<CSSValueList> parseFontFamily();
+ PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFamily();
PassRefPtrWillBeRawPtr<CSSValue> parseCounter(int defaultValue);
PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* args, bool counters);
@@ -200,10 +201,9 @@ private:
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseLineHeight();
bool parseFontSize(bool important);
- bool parseFontVariant(bool important);
+ PassRefPtrWillBeRawPtr<CSSValue> consumeFontVariant();
bool parseFontWeight(bool important);
- PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceSrc();
- PassRefPtrWillBeRawPtr<CSSValueList> parseFontFaceUnicodeRange();
+ PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceSrc();
bool parseSVGValue(CSSPropertyID propId, bool important);
PassRefPtrWillBeRawPtr<CSSValue> parseSVGStrokeDasharray();
@@ -262,9 +262,6 @@ private:
bool parseCalculation(CSSParserValue*, ValueRange);
- bool parseFontFeatureTag(CSSValueList*);
- PassRefPtrWillBeRawPtr<CSSValue> parseFontFeatureSettings();
-
bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
@@ -286,8 +283,8 @@ private:
PassRefPtrWillBeRawPtr<CSSValueList> parseSize();
SizeParameterType parseSizeParameter(CSSValueList* parsedValues, CSSParserValue*, SizeParameterType prevParamType);
- bool parseFontFaceSrcURI(CSSValueList*);
- bool parseFontFaceSrcLocal(CSSValueList*);
+ PassRefPtrWillBeRawPtr<CSSValue> consumeFontFaceSrcURI();
+ PassRefPtrWillBeRawPtr<CSSValue> consumeFontFaceSrcLocal();
class ImplicitScope {
STACK_ALLOCATED();

Powered by Google App Engine
This is Rietveld 408576698