Source/core/css/resolver/StyleBuilderConverter.h - Issue 602373003: Make style building for 'font-family' less custom.

Side by Side Diff: Source/core/css/resolver/StyleBuilderConverter.h

Issue 602373003: Make style building for 'font-family' less custom. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Init genericFamily in all cases. Created 6 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 | « Source/core/css/resolver/FontBuilder.cpp ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * * Redistributions of source code must retain the above copyright	4 * * Redistributions of source code must retain the above copyright

5 * notice, this list of conditions and the following disclaimer.	5 * notice, this list of conditions and the following disclaimer.

6 * * Redistributions in binary form must reproduce the above	6 * * Redistributions in binary form must reproduce the above

7 * copyright notice, this list of conditions and the following disclaimer	7 * copyright notice, this list of conditions and the following disclaimer

8 * in the documentation and/or other materials provided with the	8 * in the documentation and/or other materials provided with the

9 * distribution.	9 * distribution.

10 * * Neither the name of Google Inc. nor the names of its	10 * * Neither the name of Google Inc. nor the names of its

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 // Note that we assume the parser only allows valid CSSValue types.	42 // Note that we assume the parser only allows valid CSSValue types.

43	43

44 class StyleBuilderConverter {	44 class StyleBuilderConverter {

45 public:	45 public:

46 static PassRefPtr<StyleReflection> convertBoxReflect(StyleResolverState&, CS SValue*);	46 static PassRefPtr<StyleReflection> convertBoxReflect(StyleResolverState&, CS SValue*);

47 static AtomicString convertFragmentIdentifier(StyleResolverState&, CSSValue* );	47 static AtomicString convertFragmentIdentifier(StyleResolverState&, CSSValue* );

48 static Color convertColor(StyleResolverState&, CSSValue*, bool forVisitedLin k = false);	48 static Color convertColor(StyleResolverState&, CSSValue*, bool forVisitedLin k = false);

49 template <typename T> static T convertComputedLength(StyleResolverState&, CS SValue*);	49 template <typename T> static T convertComputedLength(StyleResolverState&, CS SValue*);

50 static LengthBox convertClip(StyleResolverState&, CSSValue*);	50 static LengthBox convertClip(StyleResolverState&, CSSValue*);

51 template <typename T> static T convertFlags(StyleResolverState&, CSSValue*);	51 template <typename T> static T convertFlags(StyleResolverState&, CSSValue*);

	52 static FontDescription::FamilyDescription convertFontFamily(StyleResolverSta te&, CSSValue*);

52 static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(StyleResol verState&, CSSValue*);	53 static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(StyleResol verState&, CSSValue*);

53 static FontDescription::Size convertFontSize(StyleResolverState&, CSSValue*) ;	54 static FontDescription::Size convertFontSize(StyleResolverState&, CSSValue*) ;

54 static FontWeight convertFontWeight(StyleResolverState&, CSSValue*);	55 static FontWeight convertFontWeight(StyleResolverState&, CSSValue*);

55 static FontDescription::VariantLigatures convertFontVariantLigatures(StyleRe solverState&, CSSValue*);	56 static FontDescription::VariantLigatures convertFontVariantLigatures(StyleRe solverState&, CSSValue*);

56 static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSVal ue*);	57 static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSVal ue*);

57 static GridPosition convertGridPosition(StyleResolverState&, CSSValue*);	58 static GridPosition convertGridPosition(StyleResolverState&, CSSValue*);

58 static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue*);	59 static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue*);

59 template <typename T> static T convertLineWidth(StyleResolverState&, CSSValu e*);	60 template <typename T> static T convertLineWidth(StyleResolverState&, CSSValu e*);

60 static Length convertLength(StyleResolverState&, CSSValue*);	61 static Length convertLength(StyleResolverState&, CSSValue*);

61 static Length convertLengthOrAuto(StyleResolverState&, CSSValue*);	62 static Length convertLengthOrAuto(StyleResolverState&, CSSValue*);

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 {	127 {

127 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);	128 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);

128 if (primitiveValue->getValueID() == IdForNone)	129 if (primitiveValue->getValueID() == IdForNone)

129 return nullAtom;	130 return nullAtom;

130 return AtomicString(primitiveValue->getStringValue());	131 return AtomicString(primitiveValue->getStringValue());

131 }	132 }

132	133

133 } // namespace blink	134 } // namespace blink

134	135

135 #endif	136 #endif

OLD	NEW