Changeset 188025 in webkit

Timestamp:

Aug 5, 2015 10:16:09 PM (9 years ago)

Author:

mmaxfield@apple.com

Message:

CharacterFallbackMapKey should be locale-specific
​https://bugs.webkit.org/show_bug.cgi?id=147532

Reviewed by Dean Jackson.

This is in preparation for locale-specific font fallback.

No new tests because there is no behavior change.

• platform/graphics/Font.cpp:

(WebCore::CharacterFallbackMapKey::CharacterFallbackMapKey):
(WebCore::CharacterFallbackMapKey::operator==):
(WebCore::CharacterFallbackMapKeyHash::hash):
(WebCore::Font::systemFallbackFontForCharacter):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-05  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        CharacterFallbackMapKey should be locale-specific
+        https://bugs.webkit.org/show_bug.cgi?id=147532
+
+        Reviewed by Dean Jackson.
+
+        This is in preparation for locale-specific font fallback.
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::CharacterFallbackMapKey::CharacterFallbackMapKey):
+        (WebCore::CharacterFallbackMapKey::operator==):
+        (WebCore::CharacterFallbackMapKeyHash::hash):
+        (WebCore::Font::systemFallbackFontForCharacter):
+
 2015-08-05  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -39 +39 @@
 #include <wtf/MathExtras.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/text/AtomicStringHash.h>
 
 #if ENABLE(OPENTYPE_VERTICAL)
@@ -397 +398 @@
 }
 
-struct CharacterFallbackMapKey {
+class CharacterFallbackMapKey {
+public:
     CharacterFallbackMapKey()
     {
     }
 
-    CharacterFallbackMapKey(UChar32 character, bool isForPlatformFont)
-        : character(character)
+    CharacterFallbackMapKey(const AtomicString& locale, UChar32 character, bool isForPlatformFont)
+        : locale(locale)
+        , character(character)
         , isForPlatformFont(isForPlatformFont)
     {
@@ -417 +420 @@
     bool operator==(const CharacterFallbackMapKey& other) const
     {
-        return character == other.character && isForPlatformFont == other.isForPlatformFont;
+        return locale == other.locale && character == other.character && isForPlatformFont == other.isForPlatformFont;
     }
 
     static const bool emptyValueIsZero = true;
 
+private:
+    friend struct CharacterFallbackMapKeyHash;
+
+    AtomicString locale;
     UChar32 character { 0 };
     bool isForPlatformFont { false };
@@ -429 +436 @@
     static unsigned hash(const CharacterFallbackMapKey& key)
     {
-        return WTF::pairIntHash(key.character, key.isForPlatformFont);
+        return WTF::pairIntHash(key.locale.isNull() ? 0 : WTF::AtomicStringHash::hash(key.locale), WTF::pairIntHash(key.character, key.isForPlatformFont));
     }
 
@@ -441 +448 @@
 
 // Fonts are not ref'd to avoid cycles.
+// FIXME: Shouldn't these be WeakPtrs?
 typedef HashMap<CharacterFallbackMapKey, Font*, CharacterFallbackMapKeyHash, WTF::SimpleClassHashTraits<CharacterFallbackMapKey>> CharacterFallbackMap;
 typedef HashMap<const Font*, CharacterFallbackMap> SystemFallbackCache;
@@ -459 +467 @@
     }
 
-    auto key = CharacterFallbackMapKey(character, isForPlatformFont);
+    auto key = CharacterFallbackMapKey(description.locale(), character, isForPlatformFont);
     auto characterAddResult = fontAddResult.iterator->value.add(WTF::move(key), nullptr);