Title: [188052] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 188052
- Author
- bshaf...@apple.com
- Date
- 2015-08-06 12:48:29 -0700 (Thu, 06 Aug 2015)
Log Message
Merged r187693. rdar://problem/22047626
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188051 => 188052)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-06 18:45:01 UTC (rev 188051)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-06 19:48:29 UTC (rev 188052)
@@ -1,3 +1,22 @@
+2015-08-06 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r187693.
+
+ 2015-07-31 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [Cocoa] Latin quotes are used with the system font on Chinese devices
+ https://bugs.webkit.org/show_bug.cgi?id=147504
+
+ Reviewed by Dean Jackson.
+
+ The system font has some fancy logic regarding character selection which requires
+ using Core Text for glyph selection.
+
+ No new tests because tests can't change the system language of the device.
+
+ * platform/graphics/mac/GlyphPageMac.cpp:
+ (WebCore::shouldUseCoreText):
+
2015-08-05 Matthew Hanson <matthew_han...@apple.com>
Merge r187962. rdar://problem/21827815
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (188051 => 188052)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-08-06 18:45:01 UTC (rev 188051)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-08-06 19:48:29 UTC (rev 188052)
@@ -42,7 +42,7 @@
static bool shouldUseCoreText(const UChar* buffer, unsigned bufferLength, const Font* fontData)
{
- if (fontData->platformData().isCompositeFontReference())
+ if (fontData->platformData().isCompositeFontReference() || fontData->isSystemFont())
return true;
if (fontData->platformData().widthVariant() != RegularWidth || fontData->hasVerticalGlyphs()) {
// Ideographs don't have a vertical variant or width variants.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
