third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h - Issue 2558053002: Add CSS support for font-variation-settings

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

Issue 2558053002: Add CSS support for font-variation-settings (Closed)

Patch Set: Remove empty if statement Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('K') | « third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 static FilterOperations convertFilterOperations(StyleResolverState&,	74 static FilterOperations convertFilterOperations(StyleResolverState&,

75 const CSSValue&);	75 const CSSValue&);

76 template <typename T>	76 template <typename T>

77 static T convertFlags(StyleResolverState&, const CSSValue&);	77 static T convertFlags(StyleResolverState&, const CSSValue&);

78 static FontDescription::FamilyDescription convertFontFamily(	78 static FontDescription::FamilyDescription convertFontFamily(

79 StyleResolverState&,	79 StyleResolverState&,

80 const CSSValue&);	80 const CSSValue&);

81 static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(	81 static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(

82 StyleResolverState&,	82 StyleResolverState&,

83 const CSSValue&);	83 const CSSValue&);

	84 static PassRefPtr<FontVariationSettings> convertFontVariationSettings(

	85 StyleResolverState&,

	86 const CSSValue&);

84 static FontDescription::Size convertFontSize(StyleResolverState&,	87 static FontDescription::Size convertFontSize(StyleResolverState&,

85 const CSSValue&);	88 const CSSValue&);

86 static float convertFontSizeAdjust(StyleResolverState&, const CSSValue&);	89 static float convertFontSizeAdjust(StyleResolverState&, const CSSValue&);

87 static FontWeight convertFontWeight(StyleResolverState&, const CSSValue&);	90 static FontWeight convertFontWeight(StyleResolverState&, const CSSValue&);

88 static FontDescription::FontVariantCaps convertFontVariantCaps(	91 static FontDescription::FontVariantCaps convertFontVariantCaps(

89 StyleResolverState&,	92 StyleResolverState&,

90 const CSSValue&);	93 const CSSValue&);

91 static FontDescription::VariantLigatures convertFontVariantLigatures(	94 static FontDescription::VariantLigatures convertFontVariantLigatures(

92 StyleResolverState&,	95 StyleResolverState&,

93 const CSSValue&);	96 const CSSValue&);

(...skipping 183 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
277 const CSSValue& value) {	280 const CSSValue& value) {

278 if (value.isStringValue())	281 if (value.isStringValue())

279 return AtomicString(toCSSStringValue(value).value());	282 return AtomicString(toCSSStringValue(value).value());

280 DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), IdForNone);	283 DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), IdForNone);

281 return nullAtom;	284 return nullAtom;

282 }	285 }

283	286

284 } // namespace blink	287 } // namespace blink

285	288

286 #endif	289 #endif

OLD	NEW