Changeset 192382 in webkit

Timestamp:

Nov 12, 2015 1:29:40 PM (8 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.

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

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::FontCache::systemFallbackForCharacters):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontCacheCoreText.cpp (modified) (1 diff)

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.
+
+        Test: fast/text/fallback-language-han-2.html
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontCache::systemFallbackForCharacters):
+
 2015-11-12  Anders Carlsson  <andersca@apple.com>
 

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

@@ -786 +786 @@
 
     const FontPlatformData& platformData = originalFontData->platformData();
-    // FIXME: Should pass in the locale instead of nullAtom.
-    RetainPtr<CTFontRef> result = platformLookupFallbackFont(platformData.font(), description.weight(), nullAtom, characters, length);
+    RetainPtr<CTFontRef> result = platformLookupFallbackFont(platformData.font(), description.weight(), description.locale(), characters, length);
     result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
     if (!result)