Title: [129190] trunk/Source/WebCore
- Revision
- 129190
- Author
- [email protected]
- Date
- 2012-09-20 21:42:44 -0700 (Thu, 20 Sep 2012)
Log Message
Chromium mac cannot display AppleColorEmoji
https://bugs.webkit.org/show_bug.cgi?id=97286
Reviewed by Kent Tamura.
Disable AppleColorEmoji for now. We will re-enable it after Skia supports CTFontDrawGlyphs().
No new tests. Fallback fonts should be used for emoji codepoints.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::FontCache::getFontDataForCharacters):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129189 => 129190)
--- trunk/Source/WebCore/ChangeLog 2012-09-21 04:15:18 UTC (rev 129189)
+++ trunk/Source/WebCore/ChangeLog 2012-09-21 04:42:44 UTC (rev 129190)
@@ -1,3 +1,17 @@
+2012-09-20 Kenichi Ishibashi <[email protected]>
+
+ Chromium mac cannot display AppleColorEmoji
+ https://bugs.webkit.org/show_bug.cgi?id=97286
+
+ Reviewed by Kent Tamura.
+
+ Disable AppleColorEmoji for now. We will re-enable it after Skia supports CTFontDrawGlyphs().
+
+ No new tests. Fallback fonts should be used for emoji codepoints.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::FontCache::getFontDataForCharacters):
+
2012-09-20 Luke Macpherson <[email protected]>
Fix use-after free when using a variable to specify a -webkit-filter.
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (129189 => 129190)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2012-09-21 04:15:18 UTC (rev 129189)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2012-09-21 04:42:44 UTC (rev 129190)
@@ -115,6 +115,12 @@
if (!substituteFont)
return 0;
+#if PLATFORM(CHROMIUM)
+ // Chromium can't render AppleColorEmoji.
+ if ([[substituteFont familyName] isEqual:@"Apple Color Emoji"])
+ return 0;
+#endif
+
// Use the family name from the AppKit-supplied substitute font, requesting the
// traits, weight, and size we want. One way this does better than the original
// AppKit request is that it takes synthetic bold and oblique into account.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
