Attachment 370370 Details for Bug 198099 – Patch

[patch] Patch

bug-198099-20190521190259.patch (text/plain), 3.67 KB, created by Myles C. Maxfield on 2019-05-21 19:02:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2019-05-21 19:02:59 PDT

Size: 3.67 KB

patch

obsolete

>Subversion Revision: 245598
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d7075b86e30f294f61836b3958de13b480283041..8e5425bf961c5027a6a1efee7c3631f01c6e7e07 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-21  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [watchOS] Fix build after r245598
>+        https://bugs.webkit.org/show_bug.cgi?id=198099
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests (OOPS!).
>+
>+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
>+        (WebCore::preparePlatformFont):
>+
> 2019-05-21  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         font-optical-sizing applies the wrong variation value
>diff --git a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
>index 50377622ad43e05d2586232e2d3e5276b2c39afc..867f8c7824699a3a1fe6fdccd9711f0ce8d3fb24 100644
>--- a/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
>+++ b/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
>@@ -534,15 +534,21 @@ RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, const FontDescr
>     if (!originalFont)
>         return originalFont;
> 
>+    FontType fontType { originalFont };
>+
> #if ENABLE(VARIATION_FONTS)
>     auto defaultValues = defaultVariationValues(originalFont);
> 
>     auto fontSelectionRequest = fontDescription.fontSelectionRequest();
>     auto fontOpticalSizing = fontDescription.opticalSizing();
>     auto fontStyleAxis = fontDescription.fontStyleAxis();
>+
>+    bool forceOpticalSizingOn = fontOpticalSizing == FontOpticalSizing::Enabled && fontType.variationType == FontType::VariationType::TrueTypeGX && defaultValues.contains({{'o', 'p', 's', 'z'}});
>+    bool forceVariations = defaultValues.contains({{'w', 'g', 'h', 't'}}) || defaultValues.contains({{'w', 'd', 't', 'h'}}) || (fontStyleAxis == FontStyleAxis::ital && defaultValues.contains({{'i', 't', 'a', 'l'}})) || (fontStyleAxis == FontStyleAxis::slnt && defaultValues.contains({{'s', 'l', 'n', 't'}}));
> #else
>     UNUSED_PARAM(fontFaceCapabilities);
>     UNUSED_PARAM(applyWeightWidthSlopeVariations);
>+    bool forceOpticalSizingOn = false;
> #endif
> 
>     const auto& features = fontDescription.featureSettings();
>@@ -550,14 +556,13 @@ RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, const FontDescr
>     const auto& variations = fontDescription.variationSettings();
>     auto textRenderingMode = fontDescription.textRenderingMode();
> 
>-    FontType fontType { originalFont };
>-
>-    bool forceOpticalSizingOn = fontOpticalSizing == FontOpticalSizing::Enabled && fontType.variationType == FontType::VariationType::TrueTypeGX && defaultValues.contains({{'o', 'p', 's', 'z'}});
>-    bool forceVariations = defaultValues.contains({{'w', 'g', 'h', 't'}}) || defaultValues.contains({{'w', 'd', 't', 'h'}}) || (fontStyleAxis == FontStyleAxis::ital && defaultValues.contains({{'i', 't', 'a', 'l'}})) || (fontStyleAxis == FontStyleAxis::slnt && defaultValues.contains({{'s', 'l', 'n', 't'}}));
>-
>     // We might want to check fontType.trackingType == FontType::TrackingType::Manual here, but in order to maintain compatibility with the rest of the system, we don't.
>     bool noFontFeatureSettings = features.isEmpty();
>+#if ENABLE(VARIATION_FONTS)
>     bool noFontVariationSettings = !forceVariations && variations.isEmpty();
>+#else
>+    bool noFontVariationSettings = true;
>+#endif
>     bool textRenderingModeIsAuto = textRenderingMode == TextRenderingMode::AutoTextRendering;
>     bool variantSettingsIsNormal = variantSettings.isAllNormal();
>     bool dontNeedToApplyOpticalSizing = fontOpticalSizing == FontOpticalSizing::Enabled && !forceOpticalSizingOn;

Actions: View | Formatted Diff | Diff

Attachments on bug 198099: 370370