Changeset 220997 in webkit

Timestamp:

Aug 21, 2017 6:50:34 PM (7 years ago)

Author:

mmaxfield@apple.com

Message:

DataInteractionTests.ExternalSourceAttributedStringToContentEditable hits a debug assertion
​https://bugs.webkit.org/show_bug.cgi?id=175787
<rdar://problem/33996612>

Reviewed by Wenson Hsieh.

Source/WebCore:

The variation axis values of San Francisco changed from the GX-style scale to the CSS-style
scale. Previously, we were normalizing the values we got from Core Text to fit the CSS scale;
however, this is no longer necessary since the font now does this itself.

The assertion was getting hit because the normalized values were huge and were overflowing
a single FontSelectionValue (and going negative). This patch adds handling for this
situation.

Test: DataInteractionTests.ExternalSourceBoldSystemAttributedStringToContentEditable

• platform/graphics/FontSelectionAlgorithm.h: Typedef the backing type for a FontSelectionValue.

(WebCore::FontSelectionValue::rawValue const):
(WebCore::FontSelectionValue::maximumValue):
(WebCore::FontSelectionValue::minimumValue):
(WebCore::FontSelectionValue::FontSelectionValue):

• platform/graphics/cocoa/FontCacheCoreText.cpp: Opt-out of normalization for San Francisco.

(WebCore::variationCapabilitiesForFontDescriptor):
(WebCore::capabilitiesForFontDescriptor):

Tools:

• TestWebKitAPI/Tests/ios/DataInteractionTests.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/FontSelectionAlgorithm.h (modified) (6 diffs)
• Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-21  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        DataInteractionTests.ExternalSourceAttributedStringToContentEditable hits a debug assertion
+        https://bugs.webkit.org/show_bug.cgi?id=175787
+        <rdar://problem/33996612>
+
+        Reviewed by Wenson Hsieh.
+
+        The variation axis values of San Francisco changed from the GX-style scale to the CSS-style
+        scale. Previously, we were normalizing the values we got from Core Text to fit the CSS scale;
+        however, this is no longer necessary since the font now does this itself.
+
+        The assertion was getting hit because the normalized values were huge and were overflowing
+        a single FontSelectionValue (and going negative). This patch adds handling for this
+        situation.
+
+        Test: DataInteractionTests.ExternalSourceBoldSystemAttributedStringToContentEditable
+
+        * platform/graphics/FontSelectionAlgorithm.h: Typedef the backing type for a FontSelectionValue.
+        (WebCore::FontSelectionValue::rawValue const):
+        (WebCore::FontSelectionValue::maximumValue):
+        (WebCore::FontSelectionValue::minimumValue):
+        (WebCore::FontSelectionValue::FontSelectionValue):
+        * platform/graphics/cocoa/FontCacheCoreText.cpp: Opt-out of normalization for San Francisco.
+        (WebCore::variationCapabilitiesForFontDescriptor):
+        (WebCore::capabilitiesForFontDescriptor):
+
 2017-08-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h

@@ -41 +41 @@
 class FontSelectionValue {
 public:
+    typedef int16_t BackingType;
+
     FontSelectionValue() = default;
 
@@ -73 +75 @@
     bool operator>=(const FontSelectionValue other) const;
 
-    int16_t rawValue() const
+    BackingType rawValue() const
     {
         return m_backing;
@@ -80 +82 @@
     static FontSelectionValue maximumValue()
     {
-        static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(std::numeric_limits<int16_t>::max(), RawTag::RawTag);
+        static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(std::numeric_limits<BackingType>::max(), RawTag::RawTag);
         return result.get();
     }
@@ -86 +88 @@
     static FontSelectionValue minimumValue()
     {
-        static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(std::numeric_limits<int16_t>::min(), RawTag::RawTag);
+        static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(std::numeric_limits<BackingType>::min(), RawTag::RawTag);
         return result.get();
     }
@@ -102 +104 @@
     enum class RawTag { RawTag };
 
-    FontSelectionValue(int16_t rawValue, RawTag)
+    FontSelectionValue(BackingType rawValue, RawTag)
         : m_backing(rawValue)
     {
@@ -108 +110 @@
 
     static constexpr int fractionalEntropy = 4;
-    int16_t m_backing { 0 };
+    BackingType m_backing { 0 };
 };
 

trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

@@ -999 +999 @@
     }
 
-    if (FontType(font.get()).variationType == FontType::VariationType::TrueTypeGX) {
+    bool optOutFromGXNormalization = false;
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000))
+    optOutFromGXNormalization = CTFontDescriptorIsSystemUIFont(fontDescriptor);
+#endif
+
+    if (FontType(font.get()).variationType == FontType::VariationType::TrueTypeGX && !optOutFromGXNormalization) {
         if (result.weight)
             result.weight = {{ normalizeWeight(result.weight.value().minimum), normalizeWeight(result.weight.value().maximum) }};
@@ -1007 +1012 @@
             result.slope = {{ normalizeSlope(result.slope.value().minimum), normalizeSlope(result.slope.value().maximum) }};
     }
+
+    auto minimum = static_cast<float>(FontSelectionValue::minimumValue());
+    auto maximum = static_cast<float>(FontSelectionValue::maximumValue());
+    if (result.weight && (result.weight.value().minimum < minimum || result.weight.value().maximum > maximum))
+        result.weight = { };
+    if (result.width && (result.width.value().minimum < minimum || result.width.value().maximum > maximum))
+        result.width = { };
+    if (result.slope && (result.slope.value().minimum < minimum || result.slope.value().maximum > maximum))
+        result.slope = { };
 #else
     UNUSED_PARAM(fontDescriptor);
@@ -1092 +1106 @@
 #endif
 
-    return {{ FontSelectionValue(variationCapabilities.weight.value().minimum), FontSelectionValue(variationCapabilities.weight.value().maximum) },
+    FontSelectionCapabilities result = {{ FontSelectionValue(variationCapabilities.weight.value().minimum), FontSelectionValue(variationCapabilities.weight.value().maximum) },
         { FontSelectionValue(variationCapabilities.width.value().minimum), FontSelectionValue(variationCapabilities.width.value().maximum) },
         { FontSelectionValue(variationCapabilities.slope.value().minimum), FontSelectionValue(variationCapabilities.slope.value().maximum) }};
+    ASSERT(result.weight.isValid());
+    ASSERT(result.width.isValid());
+    ASSERT(result.slope.isValid());
+    return result;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-21  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        DataInteractionTests.ExternalSourceAttributedStringToContentEditable hits a debug assertion
+        https://bugs.webkit.org/show_bug.cgi?id=175787
+        <rdar://problem/33996612>
+
+        Reviewed by Wenson Hsieh.
+
+        * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+        (TestWebKitAPI::TEST):
+
 2017-08-21  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm

@@ -686 +686 @@
 }
 
-TEST(DataInteractionTests, DISABLED_ExternalSourceBoldSystemAttributedStringToContentEditable)
+TEST(DataInteractionTests, ExternalSourceBoldSystemAttributedStringToContentEditable)
 {
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);