Changeset 217762 in webkit
- Timestamp:
- Jun 3, 2017 11:07:17 AM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r217760 r217762 1 2017-06-03 Myles C. Maxfield <mmaxfield@apple.com> 2 3 Cleanup arguments to preparePlatformFont() and fontWithFamily() in FontCacheCoreText.cpp 4 https://bugs.webkit.org/show_bug.cgi?id=172886 5 6 Reviewed by Simon Fraser. 7 8 The number of arguments is getting out of control. 9 10 No new tests because there is no behavior change. 11 12 * platform/graphics/FontCache.h: 13 * platform/graphics/cocoa/FontCacheCoreText.cpp: 14 (WebCore::preparePlatformFont): 15 (WebCore::fontWithFamily): 16 (WebCore::FontCache::createFontPlatformData): 17 (WebCore::FontCache::systemFallbackForCharacters): 18 * platform/graphics/mac/FontCacheMac.mm: 19 (WebCore::platformFontWithFamilySpecialCase): 20 * platform/graphics/mac/FontCustomPlatformData.cpp: 21 (WebCore::FontCustomPlatformData::fontPlatformData): 22 * platform/spi/cocoa/CoreTextSPI.h: 23 1 24 2017-06-03 Yusuke Suzuki <utatane.tea@gmail.com> 2 25 -
trunk/Source/WebCore/platform/graphics/FontCache.h
r217742 r217762 282 282 }; 283 283 284 RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, const FontFeatureSettings& features, const FontVariantSettings&, FontSelectionRequest, const FontVariationSettings&, FontOpticalSizing, float size, FontStyleAxis);284 RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, const FontDescription&, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, float size); 285 285 SynthesisPair computeNecessarySynthesis(CTFontRef, const FontDescription&, bool isPlatformFont = false); 286 286 RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest, float size); -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r217272 r217762 498 498 #endif 499 499 500 RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, FontSelectionRequest fontSelectionRequest, const FontVariationSettings& variations, FontOpticalSizing fontOpticalSizing, float size, FontStyleAxis axis)500 RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, const FontDescription& fontDescription, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, float size) 501 501 { 502 502 bool alwaysAddVariations = false; … … 506 506 auto defaultValues = defaultVariationValues(originalFont); 507 507 alwaysAddVariations = !defaultValues.isEmpty(); 508 509 auto fontSelectionRequest = fontDescription.fontSelectionRequest(); 510 auto fontOpticalSizing = fontDescription.opticalSizing(); 511 auto fontStyleAxis = fontDescription.fontStyleAxis(); 508 512 #else 509 UNUSED_PARAM(fontSelectionRequest);510 UNUSED_PARAM(fontOpticalSizing);511 513 UNUSED_PARAM(fontFaceCapabilities); 512 514 UNUSED_PARAM(size); 513 UNUSED_PARAM(axis); 514 #endif 515 #endif 516 517 const auto& features = fontDescription.featureSettings(); 518 const auto& variantSettings = fontDescription.variantSettings(); 519 const auto& variations = fontDescription.variationSettings(); 520 auto textRenderingMode = fontDescription.textRenderingMode(); 515 521 516 522 if (!originalFont || (!features.size() && (!alwaysAddVariations && variations.isEmpty()) && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal() … … 594 600 applyVariation({{'w', 'g', 'h', 't'}}, weight); 595 601 applyVariation({{'w', 'd', 't', 'h'}}, width); 596 if ( axis == FontStyleAxis::ital)602 if (fontStyleAxis == FontStyleAxis::ital) 597 603 applyVariation({{'i', 't', 'a', 'l'}}, 1); 598 604 else … … 1167 1173 } 1168 1174 1169 static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, FontSelectionRequest request, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, const TextRenderingMode& textRenderingMode, FontSelectionRequest fontSelectionRequest, FontOpticalSizing fontOpticalSizing, float size, FontStyleAxis axis)1175 static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, const FontDescription& fontDescription, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, FontSelectionSpecifiedCapabilities fontFaceCapabilities, float size) 1170 1176 { 1171 1177 if (family.isEmpty()) 1172 1178 return nullptr; 1173 1179 1180 const auto& request = fontDescription.fontSelectionRequest(); 1174 1181 auto foundFont = platformFontWithFamilySpecialCase(family, request, size); 1175 1182 if (!foundFont) 1176 1183 foundFont = platformFontLookupWithFamily(family, request, size); 1177 return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, featureSettings, variantSettings, fontSelectionRequest, variationSettings, fontOpticalSizing, size, axis);1184 return preparePlatformFont(foundFont.get(), fontDescription, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, size); 1178 1185 } 1179 1186 … … 1214 1221 float size = fontDescription.computedPixelSize(); 1215 1222 1216 auto font = fontWithFamily(family, fontDescription .fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, fontDescription.textRenderingMode(), fontDescription.fontSelectionRequest(), fontDescription.opticalSizing(), size, fontDescription.fontStyleAxis());1223 auto font = fontWithFamily(family, fontDescription, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, size); 1217 1224 1218 1225 #if PLATFORM(MAC) … … 1225 1232 autoActivateFont(family.string(), size); 1226 1233 1227 font = fontWithFamily(family, fontDescription .fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, fontDescription.textRenderingMode(), fontDescription.fontSelectionRequest(), fontDescription.opticalSizing(), size, fontDescription.fontStyleAxis());1234 font = fontWithFamily(family, fontDescription, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, size); 1228 1235 } 1229 1236 #endif … … 1313 1320 const FontPlatformData& platformData = originalFontData->platformData(); 1314 1321 auto result = lookupFallbackFont(platformData.font(), description.weight(), description.locale(), characters, length); 1315 result = preparePlatformFont(result.get(), description .textRenderingMode(), nullptr, nullptr, { }, description.featureSettings(), description.variantSettings(), description.fontSelectionRequest(), description.variationSettings(), description.opticalSizing(), description.computedSize(), description.fontStyleAxis());1322 result = preparePlatformFont(result.get(), description, nullptr, nullptr, { }, description.computedSize()); 1316 1323 if (!result) 1317 1324 return lastResortFallbackFont(description); -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
r217272 r217762 41 41 FontWidthVariant widthVariant = fontDescription.widthVariant(); 42 42 RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr)); 43 font = preparePlatformFont(font.get(), fontDescription .textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontFaceCapabilities, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.fontSelectionRequest(), fontDescription.variationSettings(), fontDescription.opticalSizing(), fontDescription.computedSize(), fontDescription.fontStyleAxis());43 font = preparePlatformFont(font.get(), fontDescription, &fontFaceFeatures, &fontFaceVariantSettings, fontFaceCapabilities, fontDescription.computedSize()); 44 44 ASSERT(font); 45 45 return FontPlatformData(font.get(), size, bold, italic, orientation, widthVariant, fontDescription.textRenderingMode());
Note: See TracChangeset
for help on using the changeset viewer.