Title: [179118] branches/safari-600.1.4.15-branch
- Revision
- 179118
- Author
- ddkil...@apple.com
- Date
- 2015-01-26 09:51:56 -0800 (Mon, 26 Jan 2015)
Log Message
Merged r177292. rdar://problem/19419760
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179117 => 179118)
--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 17:51:50 UTC (rev 179117)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 17:51:56 UTC (rev 179118)
@@ -1,3 +1,17 @@
+2015-01-26 David Kilzer <ddkil...@apple.com>
+
+ Merge r177292.
+
+ 2014-12-15 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [iOS] Codepoints not associated with languages are drawn as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=138906
+
+ Reviewed by Darin Adler.
+
+ * platform/ios-simulator/fast/text/non-language-font-fallback-expected.html: Added.
+ * platform/ios-simulator/fast/text/non-language-font-fallback.html: Added.
+
2015-01-24 David Kilzer <ddkil...@apple.com>
Merge r177050.
Added: branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback-expected.html (0 => 179118)
--- branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback-expected.html 2015-01-26 17:51:56 UTC (rev 179118)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that glyphs not associated with a particular language have an appropriate font chosen for them.
+<div style="font-size: 256px; font-family: Menlo-Regular;">☚</div>
+</body>
+</html>
Added: branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback.html (0 => 179118)
--- branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/non-language-font-fallback.html 2015-01-26 17:51:56 UTC (rev 179118)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that glyphs not associated with a particular language have an appropriate font chosen for them.
+<div style="font-size: 256px;">☚</div>
+</body>
+</html>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179117 => 179118)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 17:51:50 UTC (rev 179117)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 17:51:56 UTC (rev 179118)
@@ -1,3 +1,23 @@
+2015-01-26 David Kilzer <ddkil...@apple.com>
+
+ Merge r177292.
+
+ 2014-12-15 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [iOS] Codepoints not associated with languages are drawn as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=138906
+
+ Reviewed by Darin Adler.
+
+ Use SPI CTFontCreateForCharacters(), but only if we don't already know what to do
+ with the characters.
+
+ Test: platform/ios-simulator/fast/text/non-language-font-fallback.html
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * platform/spi/cocoa/CoreTextSPI.h:
+
2015-01-25 David Kilzer <ddkil...@apple.com>
Merge r177449.
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (179117 => 179118)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-26 17:51:50 UTC (rev 179117)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-26 17:51:56 UTC (rev 179118)
@@ -429,6 +429,11 @@
}
if (useEmojiFont)
simpleFontData = getCachedFontData(description, appleColorEmoji, false, DoNotRetain);
+ else {
+ RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharacters(originalFontData->getCTFont(), characters, length, nullptr));
+ if (RetainPtr<CFStringRef> foundFontName = adoptCF(CTFontCopyPostScriptName(fallbackFont.get())))
+ simpleFontData = getCachedFontData(description, foundFontName.get(), false, DoNotRetain);
+ }
break;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
