Changeset 220009 in webkit

Timestamp:

Jul 28, 2017 11:36:37 AM (7 years ago)

Author:

mmaxfield@apple.com

Message:

[macOS] Reeder's defaults font is Times instead of San Francisco
​https://bugs.webkit.org/show_bug.cgi?id=174885
<rdar://problem/33462483>

Reviewed by Simon Fraser.

Source/WebCore:

Reeder uses explicit dot-prefixed names in its source code. Within Core Text,
dot-prefixed names cannot be matched case insensitively. The solution is to
not case-fold these family names, and to make our caches case sensitive for
these special names.

Tests: fast/text/font-lookup-dot-prefix-case-sensitive-2.html

fast/text/font-lookup-dot-prefix-case-sensitive.html

• platform/graphics/FontCache.cpp:

(WebCore::FontPlatformDataCacheKey::operator==):
(WebCore::FontPlatformDataCacheKeyHash::hash):

• platform/graphics/FontCascade.cpp:

(WebCore::keysMatch):
(WebCore::computeFontCascadeCacheHash):

• platform/graphics/FontDescription.cpp:

(WebCore::FontCascadeDescription::familyNamesAreEqual):
(WebCore::FontCascadeDescription::familyNameHash):
(WebCore::FontCascadeDescription::foldedFamilyName):

• platform/graphics/FontDescription.h:
• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::FontDatabase::fontForPostScriptName):

LayoutTests:

• fast/text/font-lookup-dot-prefix-case-sensitive-2-expected.html: Added.
• fast/text/font-lookup-dot-prefix-case-sensitive-2.html: Added.
• fast/text/font-lookup-dot-prefix-case-sensitive-expected-mismatch.html: Added.
• fast/text/font-lookup-dot-prefix-case-sensitive.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/font-lookup-dot-prefix-case-sensitive-2-expected.html (added)
• LayoutTests/fast/text/font-lookup-dot-prefix-case-sensitive-2.html (added)
• LayoutTests/fast/text/font-lookup-dot-prefix-case-sensitive-expected-mismatch.html (added)
• LayoutTests/fast/text/font-lookup-dot-prefix-case-sensitive.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/FontCache.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FontCascade.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FontDescription.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FontDescription.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [macOS] Reeder's defaults font is Times instead of San Francisco
+        https://bugs.webkit.org/show_bug.cgi?id=174885
+        <rdar://problem/33462483>
+
+        Reviewed by Simon Fraser.
+
+        * fast/text/font-lookup-dot-prefix-case-sensitive-2-expected.html: Added.
+        * fast/text/font-lookup-dot-prefix-case-sensitive-2.html: Added.
+        * fast/text/font-lookup-dot-prefix-case-sensitive-expected-mismatch.html: Added.
+        * fast/text/font-lookup-dot-prefix-case-sensitive.html: Added.
+
 2017-07-28  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [macOS] Reeder's defaults font is Times instead of San Francisco
+        https://bugs.webkit.org/show_bug.cgi?id=174885
+        <rdar://problem/33462483>
+
+        Reviewed by Simon Fraser.
+
+        Reeder uses explicit dot-prefixed names in its source code. Within Core Text,
+        dot-prefixed names cannot be matched case insensitively. The solution is to
+        not case-fold these family names, and to make our caches case sensitive for
+        these special names.
+
+        Tests: fast/text/font-lookup-dot-prefix-case-sensitive-2.html
+               fast/text/font-lookup-dot-prefix-case-sensitive.html
+
+        * platform/graphics/FontCache.cpp:
+        (WebCore::FontPlatformDataCacheKey::operator==):
+        (WebCore::FontPlatformDataCacheKeyHash::hash):
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::keysMatch):
+        (WebCore::computeFontCascadeCacheHash):
+        * platform/graphics/FontDescription.cpp:
+        (WebCore::FontCascadeDescription::familyNamesAreEqual):
+        (WebCore::FontCascadeDescription::familyNameHash):
+        (WebCore::FontCascadeDescription::foldedFamilyName):
+        * platform/graphics/FontDescription.h:
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontDatabase::fontForPostScriptName):
+
 2017-07-28  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/platform/graphics/FontCache.cpp

@@ -128 +128 @@
         if (m_family.isNull() || other.m_family.isNull())
             return false;
-        return ASCIICaseInsensitiveHash::equal(m_family, other.m_family);
+        return FontCascadeDescription::familyNamesAreEqual(m_family, other.m_family);
     }
 
@@ -142 +142 @@
     {
         IntegerHasher hasher;
-        hasher.add(ASCIICaseInsensitiveHash::hash(fontKey.m_family));
+        hasher.add(FontCascadeDescription::familyNameHash(fontKey.m_family));
         hasher.add(fontKey.m_fontDescriptionKey.computeHash());
         hasher.add(fontKey.m_fontFaceFeatures.hash());

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -186 +186 @@
         return false;
     for (unsigned i = 0; i < size; ++i) {
-        if (!equalIgnoringASCIICase(a.families[i], b.families[i]))
+        if (!FontCascadeDescription::familyNamesAreEqual(a.families[i], b.families[i]))
             return false;
     }
@@ -230 +230 @@
     hasher.add(key.fontSelectorVersion);
     for (unsigned i = 0; i < key.families.size(); ++i) {
-        StringImpl* family = key.families[i].impl();
-        hasher.add(family ? ASCIICaseInsensitiveHash::hash(family) : 0);
+        auto& family = key.families[i];
+        hasher.add(family.isNull() ? 0 : FontCascadeDescription::familyNameHash(family));
     }
     return hasher.hash();

trunk/Source/WebCore/platform/graphics/FontDescription.cpp

@@ -32 +32 @@
 
 #include "LocaleToScriptMapping.h"
+#include <wtf/text/StringHash.h>
 
 namespace WebCore {
@@ -156 +157 @@
 #endif // ENABLE(TEXT_AUTOSIZING)
 
+bool FontCascadeDescription::familyNamesAreEqual(const AtomicString& family1, const AtomicString& family2)
+{
+    // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+    // always take the case insensitive patch once this radar is fixed.
+    if (family1.startsWith('.'))
+        return StringHash::equal(family1.string(), family2.string());
+    return ASCIICaseInsensitiveHash::equal(family1, family2);
+}
+
+unsigned FontCascadeDescription::familyNameHash(const AtomicString& family)
+{
+    // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+    // always take the case insensitive patch once this radar is fixed.
+    if (family.startsWith('.'))
+        return StringHash::hash(family.string());
+    return ASCIICaseInsensitiveHash::hash(family);
+}
+
+String FontCascadeDescription::foldedFamilyName(const AtomicString& family)
+{
+    // FIXME: <rdar://problem/33594253> CoreText matches dot-prefixed font names case sensitively. We should
+    // always take the case insensitive patch once this radar is fixed.
+    if (family.startsWith('.'))
+        return family.string();
+    return family.string().foldCase();
+}
+
 } // namespace WebCore

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

@@ -233 +233 @@
     const RefCountedArray<AtomicString>& families() const { return m_families; }
 
+    static bool familyNamesAreEqual(const AtomicString&, const AtomicString&);
+    static unsigned familyNameHash(const AtomicString&);
+    static String foldedFamilyName(const AtomicString&);
+
     unsigned effectiveFamilyCount() const;
     FontFamilySpecification effectiveFamilyAt(unsigned) const;

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

@@ -908 +908 @@
     const InstalledFont& fontForPostScriptName(const AtomicString& postScriptName)
     {
-        auto folded = postScriptName.string().foldCase();
+        const auto& folded = FontCascadeDescription::foldedFamilyName(postScriptName);
         return m_postScriptNameToFontDescriptors.ensure(folded, [&] {
             auto postScriptNameString = folded.createCFString();