OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/css/resolver/FontBuilder.h" | 5 #include "core/css/resolver/FontBuilder.h" |
6 | 6 |
7 #include "core/css/CSSFontSelector.h" | 7 #include "core/css/CSSFontSelector.h" |
8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
9 #include "core/dom/StyleEngine.h" | 9 #include "core/dom/StyleEngine.h" |
10 #include "core/frame/Settings.h" | 10 #include "core/frame/Settings.h" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 static void fontStyleBase(FontDescription& d) { d.setStyle(FontStyleItalic); } | 109 static void fontStyleBase(FontDescription& d) { d.setStyle(FontStyleItalic); } |
110 static void fontStyleValue(FontBuilder& b) { b.setStyle(FontStyleNormal); } | 110 static void fontStyleValue(FontBuilder& b) { b.setStyle(FontStyleNormal); } |
111 | 111 |
112 static void fontVariantCapsBase(FontDescription& d) { d.setVariantCaps(FontDescr
iption::SmallCaps); } | 112 static void fontVariantCapsBase(FontDescription& d) { d.setVariantCaps(FontDescr
iption::SmallCaps); } |
113 static void fontVariantCapsValue(FontBuilder& b) { b.setVariantCaps(FontDescript
ion::CapsNormal); } | 113 static void fontVariantCapsValue(FontBuilder& b) { b.setVariantCaps(FontDescript
ion::CapsNormal); } |
114 | 114 |
115 static void fontVariantLigaturesBase(FontDescription& d) { d.setVariantLigatures
(FontDescription::VariantLigatures(FontDescription::EnabledLigaturesState)); } | 115 static void fontVariantLigaturesBase(FontDescription& d) { d.setVariantLigatures
(FontDescription::VariantLigatures(FontDescription::EnabledLigaturesState)); } |
116 static void fontVariantLigaturesValue(FontBuilder& b) { b.setVariantLigatures(Fo
ntDescription::VariantLigatures(FontDescription::DisabledLigaturesState)); } | 116 static void fontVariantLigaturesValue(FontBuilder& b) { b.setVariantLigatures(Fo
ntDescription::VariantLigatures(FontDescription::DisabledLigaturesState)); } |
117 | 117 |
| 118 static void fontVariantNumericBase(FontDescription& d) { d.setVariantNumeric(Fon
tVariantNumeric()); } |
| 119 static void fontVariantNumericValue(FontBuilder& b) |
| 120 { |
| 121 FontVariantNumeric variantNumeric; |
| 122 variantNumeric.setNumericFraction(FontVariantNumeric::StackedFractions); |
| 123 b.setVariantNumeric(variantNumeric); |
| 124 } |
| 125 |
118 static void fontTextRenderingBase(FontDescription& d) { d.setTextRendering(Geome
tricPrecision); } | 126 static void fontTextRenderingBase(FontDescription& d) { d.setTextRendering(Geome
tricPrecision); } |
119 static void fontTextRenderingValue(FontBuilder& b) { b.setTextRendering(Optimize
Legibility); } | 127 static void fontTextRenderingValue(FontBuilder& b) { b.setTextRendering(Optimize
Legibility); } |
120 | 128 |
121 static void fontKerningBase(FontDescription& d) { d.setKerning(FontDescription::
NormalKerning); } | 129 static void fontKerningBase(FontDescription& d) { d.setKerning(FontDescription::
NormalKerning); } |
122 static void fontKerningValue(FontBuilder& b) { b.setKerning(FontDescription::Non
eKerning); } | 130 static void fontKerningValue(FontBuilder& b) { b.setKerning(FontDescription::Non
eKerning); } |
123 | 131 |
124 static void fontFontSmoothingBase(FontDescription& d) { d.setFontSmoothing(Antia
liased); } | 132 static void fontFontSmoothingBase(FontDescription& d) { d.setFontSmoothing(Antia
liased); } |
125 static void fontFontSmoothingValue(FontBuilder& b) { b.setFontSmoothing(Subpixel
Antialiased); } | 133 static void fontFontSmoothingValue(FontBuilder& b) { b.setFontSmoothing(Subpixel
Antialiased); } |
126 | 134 |
127 static void fontSizeBase(FontDescription& d) | 135 static void fontSizeBase(FontDescription& d) |
(...skipping 18 matching lines...) Expand all Loading... |
146 } | 154 } |
147 | 155 |
148 INSTANTIATE_TEST_CASE_P(AllFields, FontBuilderAdditiveTest, | 156 INSTANTIATE_TEST_CASE_P(AllFields, FontBuilderAdditiveTest, |
149 ::testing::Values(FunctionPair(fontWeightBase, fontWeightValue), | 157 ::testing::Values(FunctionPair(fontWeightBase, fontWeightValue), |
150 FunctionPair(fontStretchBase, fontStretchValue), | 158 FunctionPair(fontStretchBase, fontStretchValue), |
151 FunctionPair(fontFamilyBase, fontFamilyValue), | 159 FunctionPair(fontFamilyBase, fontFamilyValue), |
152 FunctionPair(fontFeatureSettingsBase, fontFeatureSettingsValue), | 160 FunctionPair(fontFeatureSettingsBase, fontFeatureSettingsValue), |
153 FunctionPair(fontStyleBase, fontStyleValue), | 161 FunctionPair(fontStyleBase, fontStyleValue), |
154 FunctionPair(fontVariantCapsBase, fontVariantCapsValue), | 162 FunctionPair(fontVariantCapsBase, fontVariantCapsValue), |
155 FunctionPair(fontVariantLigaturesBase, fontVariantLigaturesValue), | 163 FunctionPair(fontVariantLigaturesBase, fontVariantLigaturesValue), |
| 164 FunctionPair(fontVariantNumericBase, fontVariantNumericValue), |
156 FunctionPair(fontTextRenderingBase, fontTextRenderingValue), | 165 FunctionPair(fontTextRenderingBase, fontTextRenderingValue), |
157 FunctionPair(fontKerningBase, fontKerningValue), | 166 FunctionPair(fontKerningBase, fontKerningValue), |
158 FunctionPair(fontFontSmoothingBase, fontFontSmoothingValue), | 167 FunctionPair(fontFontSmoothingBase, fontFontSmoothingValue), |
159 FunctionPair(fontSizeBase, fontSizeValue), | 168 FunctionPair(fontSizeBase, fontSizeValue), |
160 FunctionPair(fontScriptBase, fontScriptValue))); | 169 FunctionPair(fontScriptBase, fontScriptValue))); |
161 | 170 |
162 } // namespace blink | 171 } // namespace blink |
OLD | NEW |