Changeset 192372 in webkit

Timestamp:

Nov 12, 2015, 11:37:53 AM (10 years ago)

Author:

mmaxfield@apple.com

Message:

[Cocoa] Font fallback is not language-sensitive
​https://bugs.webkit.org/show_bug.cgi?id=147390

Reviewed by Dean Jackson.

Source/WebCore:

This re-applies r190754 in a somewhat more performant way.

Test: fast/text/fallback-language-han-2.html

• platform/graphics/Font.cpp:

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

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::FontCache::systemFallbackForCharacters):

LayoutTests:

This patch adds a mismatch test to make sure a codepoint gets rendered differently given two different langs.

• fast/text/fallback-language-han-2-expected-mismatch.html: Added.
• fast/text/fallback-language-han-2.html: Added.
• platform/efl/TestExpectations:
• platform/gtk/TestExpectations:
• platform/mac/TestExpectations:
• platform/win/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/fallback-language-han-2-expected-mismatch.html (added)
• LayoutTests/fast/text/fallback-language-han-2.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Font.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Font fallback is not language-sensitive
+        https://bugs.webkit.org/show_bug.cgi?id=147390
+
+        Reviewed by Dean Jackson.
+
+        This patch adds a mismatch test to make sure a codepoint gets rendered differently given two different langs.
+
+        * fast/text/fallback-language-han-2-expected-mismatch.html: Added.
+        * fast/text/fallback-language-han-2.html: Added.
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+
 2015-11-11  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -2357 +2357 @@
 # This test hardcodes the result of a platform-dependent font lookup algorithm.
 fast/text/fallback-language-han.html [ Skip ]
+fast/text/fallback-language-han-2.html [ Skip ]
 
 # This test uses an MPEG-4 video

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2560 +2560 @@
 # This test hardcodes the result of a platform-dependent font lookup algorithm.
 fast/text/fallback-language-han.html [ Skip ]
+fast/text/fallback-language-han-2.html [ Skip ]
 
 # This test uses an MPEG-4 video

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1270 +1270 @@
 # Language-specific font fallback is disabled on certain versions of OS X
 webkit.org/b/147390 [ Mavericks Yosemite ElCapitan ] fast/text/fallback-language-han.html [ ImageOnlyFailure ]
+webkit.org/b/147390 [ Mavericks Yosemite ElCapitan ] fast/text/fallback-language-han-2.html [ ImageOnlyFailure ]
 
 # This test relies on iOS-specific font fallback.

trunk/LayoutTests/platform/win/TestExpectations

@@ -3189 +3189 @@
 # This test hardcodes the result of a platform-dependent font lookup algorithm.
 fast/text/fallback-language-han.html [ Skip ]
+fast/text/fallback-language-han-2.html [ Skip ]
 
 # Changing system language is not supported.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Font fallback is not language-sensitive
+        https://bugs.webkit.org/show_bug.cgi?id=147390
+
+        Reviewed by Dean Jackson.
+
+        This re-applies r190754 in a somewhat more performant way.
+
+        Test: fast/text/fallback-language-han-2.html
+
+        * platform/graphics/Font.cpp:
+        (WebCore::CharacterFallbackMapKey::CharacterFallbackMapKey):
+        (WebCore::CharacterFallbackMapKey::operator==):
+        (WebCore::CharacterFallbackMapKeyHash::hash):
+        (WebCore::Font::systemFallbackFontForCharacter):
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontCache::systemFallbackForCharacters):
+
 2015-11-11  Jon Honeycutt  <jhoneycutt@apple.com>
 

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

@@ -395 +395 @@
     }
 
-    CharacterFallbackMapKey(UChar32 character, bool isForPlatformFont)
-        : character(character)
+    CharacterFallbackMapKey(const AtomicString& locale, UChar32 character, bool isForPlatformFont)
+        : locale(locale)
+        , character(character)
         , isForPlatformFont(isForPlatformFont)
     {
@@ -410 +411 @@
     bool operator==(const CharacterFallbackMapKey& other) const
     {
-        return character == other.character && isForPlatformFont == other.isForPlatformFont;
+        return locale == other.locale && character == other.character && isForPlatformFont == other.isForPlatformFont;
     }
 
@@ -418 +419 @@
     friend struct CharacterFallbackMapKeyHash;
 
+    AtomicString locale;
     UChar32 character { 0 };
     bool isForPlatformFont { false };
@@ -425 +427 @@
     static unsigned hash(const CharacterFallbackMapKey& key)
     {
-        return WTF::pairIntHash(key.character, key.isForPlatformFont);
+        IntegerHasher hasher;
+        hasher.add(key.character);
+        hasher.add(key.isForPlatformFont);
+        hasher.add(key.locale.isNull() ? 0 : key.locale.impl()->existingHash());
+        return hasher.hash();
     }
 
@@ -456 +462 @@
     }
 
-    auto key = CharacterFallbackMapKey(character, isForPlatformFont);
+    auto key = CharacterFallbackMapKey(description.locale(), character, isForPlatformFont);
     auto characterAddResult = fontAddResult.iterator->value.add(WTF::move(key), nullptr);