<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192895] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192895">192895</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 11:24:52 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Adjacent emoji overlap each other
https://bugs.webkit.org/show_bug.cgi?id=151690
<rdar://problem/23430453>
Reviewed by Simon Fraser.
Source/WebCore:
This is a partial revert of <a href="http://trac.webkit.org/projects/webkit/changeset/188737">r188737</a>. It turns out that only CoreText gives correct
glyph advances for emoji. In <a href="http://trac.webkit.org/projects/webkit/changeset/188737">r188737</a>, I reverted the special iOS emoji processing,
but also removed the logic of using CoreText for emoji advances. This patch adds
the m_isEmoji boolean back, so we can tell if we need to force
platformWidthForGlyph() to use CoreText.
This patch also performs a little bit of cleanup by moving Font's m_isSystemFont
to FontPlatformData where it belongs.
Test: fast/text/emoji-overlap.html
* platform/graphics/Font.cpp:
(WebCore::fillGlyphPage): Removed unnecessary argument.
(WebCore::Font::Font): Deleted.
* platform/graphics/Font.h: Moved getters and booleans to FontPlatformData.
(WebCore::Font::hasCustomTracking): Deleted.
(WebCore::Font::isSystemFont): Deleted.
* platform/graphics/FontPlatformData.cpp:
(WebCore::FontPlatformData::FontPlatformData): Initialize new booleans.
(WebCore::FontPlatformData::operator=): Ditto.
* platform/graphics/FontPlatformData.h: Getters for new booleans.
(WebCore::FontPlatformData::isSystemFont):
(WebCore::FontPlatformData::hasCustomTracking):
(WebCore::FontPlatformData::isEmoji):
* platform/graphics/GlyphPage.h: Remove unnecessary argument.
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::advanceForColorBitmapFont): Return an Optional instead of using an out
argument.
(WebCore::canUseFastGlyphAdvanceGetter): Make sure that we use CoreText if we are
using the Emoji font.
(WebCore::Font::platformWidthForGlyph):
(WebCore::Font::platformInit): Deleted.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm: Deal with the new booleans.
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::platformDataInit):
(WebCore::FontPlatformData::platformDataAssign):
(WebCore::FontPlatformData::setFont):
* platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp:
(WebCore::GlyphPage::fill): Removed unnecessary argument.
* platform/graphics/mac/GlyphPageMac.cpp:
(WebCore::shouldUseCoreText): Use a reference instead of a pointer.
(WebCore::GlyphPage::fill): Removed unnecessary argument.
* platform/graphics/win/FontCGWin.cpp:
(WebCore::FontCascade::drawGlyphs): Update for new location of booleans.
* platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
(WebCore::GlyphPage::fill): Removed unnecessary argument.
* platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:
(WebCore::GlyphPage::fill): Removed unnecessary argument.
* platform/graphics/win/UniscribeController.cpp:
(WebCore::UniscribeController::shapeAndPlaceItem): Update for new location of
booleans.
LayoutTests:
* fast/text/emoji-overlap-expected.html: Added.
* fast/text/emoji-overlap.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp">trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageh">trunk/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeGlyphPageTreeNodeFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp">trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCGWincpp">trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCGWincpp">trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCairoWincpp">trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp">trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextemojioverlapexpectedhtml">trunk/LayoutTests/fast/text/emoji-overlap-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextemojioverlaphtml">trunk/LayoutTests/fast/text/emoji-overlap.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/LayoutTests/ChangeLog 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Adjacent emoji overlap each other
+ https://bugs.webkit.org/show_bug.cgi?id=151690
+ <rdar://problem/23430453>
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/emoji-overlap-expected.html: Added.
+ * fast/text/emoji-overlap.html: Added.
+
+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> [Win] Web fonts with small caps have excess whitespace with the complex text codepath
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextemojioverlapexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/emoji-overlap-expected.html (0 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/emoji-overlap-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/emoji-overlap-expected.html 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<body>
+This test makes sure that adjacent emoji don't overlap. The test passes if there is some (narrow) whitespace between the emoji below.
+<div><span style="display: inline-block; transform-origin: top left; transform: scale(5); border-right: solid black 1px;"><span style="display: inline-block; width: 21px;">😉</span><span style="display: inline-block; width: 21px;">😌</span><span style="display: inline-block; width: 21px;">😗</span></span></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextemojioverlaphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/emoji-overlap.html (0 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/emoji-overlap.html (rev 0)
+++ trunk/LayoutTests/fast/text/emoji-overlap.html 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<body>
+This test makes sure that adjacent emoji don't overlap. The test passes if there is some (narrow) whitespace between the emoji below.
+<div><span style="display: inline-block; transform-origin: top left; transform: scale(5); border-right: solid black 1px;">😉😌😗</span></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -1,5 +1,65 @@
</span><span class="cx"> 2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] Adjacent emoji overlap each other
+ https://bugs.webkit.org/show_bug.cgi?id=151690
+ <rdar://problem/23430453>
+
+ Reviewed by Simon Fraser.
+
+ This is a partial revert of r188737. It turns out that only CoreText gives correct
+ glyph advances for emoji. In r188737, I reverted the special iOS emoji processing,
+ but also removed the logic of using CoreText for emoji advances. This patch adds
+ the m_isEmoji boolean back, so we can tell if we need to force
+ platformWidthForGlyph() to use CoreText.
+
+ This patch also performs a little bit of cleanup by moving Font's m_isSystemFont
+ to FontPlatformData where it belongs.
+
+ Test: fast/text/emoji-overlap.html
+
+ * platform/graphics/Font.cpp:
+ (WebCore::fillGlyphPage): Removed unnecessary argument.
+ (WebCore::Font::Font): Deleted.
+ * platform/graphics/Font.h: Moved getters and booleans to FontPlatformData.
+ (WebCore::Font::hasCustomTracking): Deleted.
+ (WebCore::Font::isSystemFont): Deleted.
+ * platform/graphics/FontPlatformData.cpp:
+ (WebCore::FontPlatformData::FontPlatformData): Initialize new booleans.
+ (WebCore::FontPlatformData::operator=): Ditto.
+ * platform/graphics/FontPlatformData.h: Getters for new booleans.
+ (WebCore::FontPlatformData::isSystemFont):
+ (WebCore::FontPlatformData::hasCustomTracking):
+ (WebCore::FontPlatformData::isEmoji):
+ * platform/graphics/GlyphPage.h: Remove unnecessary argument.
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::advanceForColorBitmapFont): Return an Optional instead of using an out
+ argument.
+ (WebCore::canUseFastGlyphAdvanceGetter): Make sure that we use CoreText if we are
+ using the Emoji font.
+ (WebCore::Font::platformWidthForGlyph):
+ (WebCore::Font::platformInit): Deleted.
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm: Deal with the new booleans.
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::platformDataInit):
+ (WebCore::FontPlatformData::platformDataAssign):
+ (WebCore::FontPlatformData::setFont):
+ * platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp:
+ (WebCore::GlyphPage::fill): Removed unnecessary argument.
+ * platform/graphics/mac/GlyphPageMac.cpp:
+ (WebCore::shouldUseCoreText): Use a reference instead of a pointer.
+ (WebCore::GlyphPage::fill): Removed unnecessary argument.
+ * platform/graphics/win/FontCGWin.cpp:
+ (WebCore::FontCascade::drawGlyphs): Update for new location of booleans.
+ * platform/graphics/win/GlyphPageTreeNodeCGWin.cpp:
+ (WebCore::GlyphPage::fill): Removed unnecessary argument.
+ * platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp:
+ (WebCore::GlyphPage::fill): Removed unnecessary argument.
+ * platform/graphics/win/UniscribeController.cpp:
+ (WebCore::UniscribeController::shapeAndPlaceItem): Update for new location of
+ booleans.
+
+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> [Win] Web fonts with small caps have excess whitespace with the complex text codepath
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151698
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -64,9 +64,6 @@
</span><span class="cx"> , m_isBrokenIdeographFallback(false)
</span><span class="cx"> , m_hasVerticalGlyphs(false)
</span><span class="cx"> , m_isUsedInSystemFallbackCache(false)
</span><del>-#if PLATFORM(COCOA) || PLATFORM(WIN)
- , m_isSystemFont(false)
-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_shouldNotBeUsedForArabic(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -155,7 +152,7 @@
</span><span class="cx"> if (auto* svgData = font.svgData())
</span><span class="cx"> return svgData->fillSVGGlyphPage(&pageToFill, buffer, bufferLength);
</span><span class="cx"> #endif
</span><del>- bool hasGlyphs = pageToFill.fill(buffer, bufferLength, &font);
</del><ins>+ bool hasGlyphs = pageToFill.fill(buffer, bufferLength);
</ins><span class="cx"> #if ENABLE(OPENTYPE_VERTICAL)
</span><span class="cx"> if (hasGlyphs && font.verticalData())
</span><span class="cx"> font.verticalData()->substituteWithVerticalGlyphs(&font, &pageToFill);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -193,7 +193,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CFDictionaryRef getCFStringAttributes(bool enableKerning, FontOrientation) const;
</span><del>- bool hasCustomTracking() const { return isSystemFont(); }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || USE(HARFBUZZ)
</span><span class="lines">@@ -203,7 +202,6 @@
</span><span class="cx"> bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t glyphCount, bool enableKerning, bool requiresShaping) const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN)
</span><del>- bool isSystemFont() const { return m_isSystemFont; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -313,9 +311,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_isUsedInSystemFallbackCache : 1;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA) || PLATFORM(WIN)
- unsigned m_isSystemFont : 1;
-#endif
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unsigned m_shouldNotBeUsedForArabic : 1;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_isHashTableDeletedValue = source.m_isHashTableDeletedValue;
</span><span class="cx"> m_isColorBitmapFont = source.m_isColorBitmapFont;
</span><ins>+ m_isSystemFont = source.m_isSystemFont;
</ins><span class="cx"> platformDataInit(source);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,6 +84,7 @@
</span><span class="cx"> m_widthVariant = other.m_widthVariant;
</span><span class="cx"> m_isColorBitmapFont = other.m_isColorBitmapFont;
</span><span class="cx"> m_textRenderingMode = other.m_textRenderingMode;
</span><ins>+ m_isSystemFont = other.m_isSystemFont;
</ins><span class="cx">
</span><span class="cx"> return platformDataAssign(other);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -115,6 +115,9 @@
</span><span class="cx"> static RetainPtr<CFTypeRef> objectForEqualityCheck(CTFontRef);
</span><span class="cx"> RetainPtr<CFTypeRef> objectForEqualityCheck() const;
</span><span class="cx">
</span><ins>+ bool isSystemFont() const { return m_isSystemFont; }
+ bool hasCustomTracking() const { return isSystemFont(); }
+
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> // FIXME: Remove this when all NSFont usage is removed.
</span><span class="cx"> NSFont *nsFont() const { return (NSFont *)m_font.get(); }
</span><span class="lines">@@ -182,6 +185,15 @@
</span><span class="cx"> return m_isHashTableDeletedValue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isEmoji() const
+ {
+#if PLATFORM(IOS)
+ return m_isEmoji;
+#else
+ return false;
+#endif
+ }
+
</ins><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(WIN)
</span><span class="cx"> PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
</span><span class="cx"> #endif
</span><span class="lines">@@ -227,10 +239,10 @@
</span><span class="cx">
</span><span class="cx"> bool m_isColorBitmapFont { false };
</span><span class="cx"> bool m_isHashTableDeletedValue { false };
</span><ins>+ bool m_isSystemFont { false };
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> bool m_isEmoji { false };
</span><span class="cx"> #endif
</span><del>-
</del><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> bool m_useGDI { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPage.h (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Implemented by the platform.
</span><del>- bool fill(UChar* characterBuffer, unsigned bufferLength, const Font*);
</del><ins>+ bool fill(UChar* characterBuffer, unsigned bufferLength);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit GlyphPage(const Font& font)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -154,8 +154,6 @@
</span><span class="cx"> LOG_ERROR("failed to set up font, using system font %s", m_platformData.font());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_isSystemFont = CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(m_platformData.font())).get());
-
</del><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</span><span class="cx"> // Work around <rdar://problem/19433490>
</span><span class="cx"> CGGlyph dummyGlyphs[] = {0, 0};
</span><span class="lines">@@ -232,7 +230,6 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>- m_isSystemFont = CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(m_platformData.font())).get());
</del><span class="cx"> m_syntheticBoldOffset = m_platformData.m_syntheticBold ? ceilf(m_platformData.size() / 24.0f) : 0.f;
</span><span class="cx">
</span><span class="cx"> CTFontRef ctFont = m_platformData.font();
</span><span class="lines">@@ -413,30 +410,27 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph, CGSize& advance)
</del><ins>+static inline Optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> NSFont *font = platformData.nsFont();
</span><span class="cx"> if (!font || !platformData.isColorBitmapFont())
</span><del>- return false;
- advance = NSSizeToCGSize([font advancementForGlyph:glyph]);
- return true;
</del><ins>+ return Nullopt;
+ return NSSizeToCGSize([font advancementForGlyph:glyph]);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(platformData);
</span><span class="cx"> UNUSED_PARAM(glyph);
</span><del>- UNUSED_PARAM(advance);
- return false;
</del><ins>+ return Nullopt;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool canUseFastGlyphAdvanceGetter(const Font& font, Glyph glyph, CGSize& advance, bool& populatedAdvance)
</del><ins>+static inline bool canUseFastGlyphAdvanceGetter(const FontPlatformData& platformData, Glyph glyph, CGSize& advance, bool& populatedAdvance)
</ins><span class="cx"> {
</span><del>- const FontPlatformData& platformData = font.platformData();
- // Fast getter doesn't doesn't work for emoji, bitmap fonts, or take custom tracking into account
- if (font.hasCustomTracking() || platformData.textRenderingMode() == OptimizeLegibility)
</del><ins>+ if (platformData.isEmoji() || platformData.hasCustomTracking() || platformData.textRenderingMode() == OptimizeLegibility)
</ins><span class="cx"> return false;
</span><del>- if (advanceForColorBitmapFont(platformData, glyph, advance)) {
</del><ins>+ if (auto size = advanceForColorBitmapFont(platformData, glyph)) {
</ins><span class="cx"> populatedAdvance = true;
</span><ins>+ advance = size.value();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -447,7 +441,7 @@
</span><span class="cx"> CGSize advance = CGSizeZero;
</span><span class="cx"> bool horizontal = platformData().orientation() == Horizontal;
</span><span class="cx"> bool populatedAdvance = false;
</span><del>- if ((horizontal || m_isBrokenIdeographFallback) && canUseFastGlyphAdvanceGetter(*this, glyph, advance, populatedAdvance)) {
</del><ins>+ if ((horizontal || m_isBrokenIdeographFallback) && canUseFastGlyphAdvanceGetter(this->platformData(), glyph, advance, populatedAdvance)) {
</ins><span class="cx"> float pointSize = platformData().m_size;
</span><span class="cx"> CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
</span><span class="cx"> if (!CGFontGetGlyphAdvancesForStyle(platformData().cgFont(), &m, renderingStyle(platformData()), &glyph, 1, &advance)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> ASSERT_ARG(font, font);
</span><span class="cx"> m_font = font;
</span><span class="cx"> m_isColorBitmapFont = CTFontGetSymbolicTraits(font) & kCTFontTraitColorGlyphs;
</span><ins>+ m_isSystemFont = CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(m_font.get())).get());
+
+#if PLATFORM(IOS)
+ m_isEmoji = CTFontIsAppleColorEmoji(m_font.get());
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontPlatformData::~FontPlatformData()
</span><span class="lines">@@ -59,6 +64,10 @@
</span><span class="cx">
</span><span class="cx"> m_cgFont = f.m_cgFont;
</span><span class="cx"> m_ctFont = f.m_ctFont;
</span><ins>+
+#if PLATFORM(IOS)
+ m_isEmoji = f.m_isEmoji;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& f)
</span><span class="lines">@@ -69,6 +78,10 @@
</span><span class="cx"> m_font = f.m_font;
</span><span class="cx"> m_ctFont = f.m_ctFont;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ m_isEmoji = f.m_isEmoji;
+#endif
+
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,6 +121,11 @@
</span><span class="cx">
</span><span class="cx"> CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(m_font.get());
</span><span class="cx"> m_isColorBitmapFont = traits & kCTFontTraitColorGlyphs;
</span><ins>+ m_isSystemFont = CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(m_font.get())).get());
+
+#if PLATFORM(IOS)
+ m_isEmoji = CTFontIsAppleColorEmoji(m_font.get());
+#endif
</ins><span class="cx">
</span><span class="cx"> m_ctFont = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeGlyphPageTreeNodeFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -39,9 +39,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
</ins><span class="cx"> {
</span><del>- cairo_scaled_font_t* scaledFont = fontData->platformData().scaledFont();
</del><ins>+ const Font& font = this->font();
+ cairo_scaled_font_t* scaledFont = font.platformData().scaledFont();
</ins><span class="cx"> ASSERT(scaledFont);
</span><span class="cx">
</span><span class="cx"> FT_Face face = cairo_ft_scaled_font_lock_face(scaledFont);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacGlyphPageMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -40,14 +40,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool shouldUseCoreText(const UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+static bool shouldUseCoreText(const UChar* buffer, unsigned bufferLength, const Font& fontData)
</ins><span class="cx"> {
</span><span class="cx"> // This needs to be kept in sync with GlyphPage::fill(). Currently, the CoreText paths are not able to handle
</span><span class="cx"> // every situtation. Returning true from this function in a new situation will require you to explicitly add
</span><span class="cx"> // handling for that situation in the CoreText paths of GlyphPage::fill().
</span><del>- if (fontData->isSystemFont())
</del><ins>+ if (fontData.platformData().isSystemFont())
</ins><span class="cx"> return true;
</span><del>- if (fontData->platformData().isForTextCombine() || fontData->hasVerticalGlyphs()) {
</del><ins>+ if (fontData.platformData().isForTextCombine() || fontData.hasVerticalGlyphs()) {
</ins><span class="cx"> // Ideographs don't have a vertical variant or width variants.
</span><span class="cx"> for (unsigned i = 0; i < bufferLength; ++i) {
</span><span class="cx"> if (!FontCascade::isCJKIdeograph(buffer[i]))
</span><span class="lines">@@ -58,27 +58,27 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
</ins><span class="cx"> {
</span><del>- ASSERT(fontData == &font());
</del><span class="cx"> ASSERT(bufferLength == GlyphPage::size || bufferLength == 2 * GlyphPage::size);
</span><span class="cx">
</span><ins>+ const Font& font = this->font();
</ins><span class="cx"> Vector<CGGlyph, 512> glyphs(bufferLength);
</span><span class="cx"> unsigned glyphStep;
</span><del>- if (!shouldUseCoreText(buffer, bufferLength, fontData)) {
</del><ins>+ if (!shouldUseCoreText(buffer, bufferLength, font)) {
</ins><span class="cx"> // We pass in either 256 or 512 UTF-16 characters: 256 for U+FFFF and less, 512 (double character surrogates)
</span><span class="cx"> // for U+10000 and above. It is indeed possible to get back 512 glyphs back from the API, so the glyph buffer
</span><span class="cx"> // we pass in must be 512. If we get back more than 256 glyphs though we'll ignore all the ones after 256,
</span><span class="cx"> // this should not happen as the only time we pass in 512 characters is when they are surrogates.
</span><del>- CGFontGetGlyphsForUnichars(fontData->platformData().cgFont(), buffer, glyphs.data(), bufferLength);
</del><ins>+ CGFontGetGlyphsForUnichars(font.platformData().cgFont(), buffer, glyphs.data(), bufferLength);
</ins><span class="cx"> glyphStep = 1;
</span><span class="cx"> } else {
</span><span class="cx"> // Because we know the implementation of shouldUseCoreText(), if the font isn't for text combine and it isn't a system font,
</span><span class="cx"> // we know it must have vertical glyphs.
</span><del>- if (fontData->platformData().isForTextCombine() || fontData->isSystemFont())
- CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength);
</del><ins>+ if (font.platformData().isForTextCombine() || font.platformData().isSystemFont())
+ CTFontGetGlyphsForCharacters(font.platformData().ctFont(), buffer, glyphs.data(), bufferLength);
</ins><span class="cx"> else
</span><del>- CTFontGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength);
</del><ins>+ CTFontGetVerticalGlyphsForCharacters(font.platformData().ctFont(), buffer, glyphs.data(), bufferLength);
</ins><span class="cx">
</span><span class="cx"> // When buffer consists of surrogate pairs, CTFontGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
</span><span class="cx"> // place the glyphs at indices corresponding to the first character of each pair.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> FloatSize translation = glyphBuffer.offsetAt(from);
</span><span class="cx">
</span><span class="cx"> CGContextSetFontSize(cgContext, platformData.size());
</span><del>- wkSetCGContextFontRenderingStyle(cgContext, font.isSystemFont(), false, font.platformData().useGDI());
</del><ins>+ wkSetCGContextFontRenderingStyle(cgContext, font.platformData().isSystemFont(), false, font.platformData().useGDI());
</ins><span class="cx">
</span><span class="cx"> FloatSize shadowOffset;
</span><span class="cx"> float shadowBlur;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCGWin.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -34,16 +34,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
</ins><span class="cx"> {
</span><span class="cx"> // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
</span><span class="cx"> // We won't support this for now.
</span><span class="cx"> if (bufferLength > GlyphPage::size)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ const Font& font = this->font();
</ins><span class="cx"> bool haveGlyphs = false;
</span><span class="cx"> CGGlyph localGlyphBuffer[GlyphPage::size];
</span><del>- wkGetGlyphs(fontData->platformData().cgFont(), buffer, localGlyphBuffer, bufferLength);
</del><ins>+ wkGetGlyphs(font.platformData().cgFont(), buffer, localGlyphBuffer, bufferLength);
</ins><span class="cx"> for (unsigned i = 0; i < GlyphPage::size; i++) {
</span><span class="cx"> Glyph glyph = localGlyphBuffer[i];
</span><span class="cx"> if (!glyph)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinGlyphPageTreeNodeCairoWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -34,18 +34,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool GlyphPage::fill(UChar* buffer, unsigned bufferLength, const Font* fontData)
</del><ins>+bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
</ins><span class="cx"> {
</span><span class="cx"> // bufferLength will be greater than the requested number of glyphs if the buffer contains surrogate pairs.
</span><span class="cx"> // We won't support this for now.
</span><span class="cx"> if (bufferLength > GlyphPage::size)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ const Font& font = this->font();
</ins><span class="cx"> bool haveGlyphs = false;
</span><span class="cx">
</span><span class="cx"> HWndDC dc(0);
</span><span class="cx"> SaveDC(dc);
</span><del>- SelectObject(dc, fontData->platformData().hfont());
</del><ins>+ SelectObject(dc, font.platformData().hfont());
</ins><span class="cx">
</span><span class="cx"> WORD localGlyphBuffer[GlyphPage::size * 2];
</span><span class="cx"> DWORD result = GetGlyphIndices(dc, buffer, bufferLength, localGlyphBuffer, GGI_MARK_NONEXISTING_GLYPHS);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinUniscribeControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp (192894 => 192895)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2015-12-01 19:10:07 UTC (rev 192894)
+++ trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2015-12-01 19:24:52 UTC (rev 192895)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> // Match AppKit's rules for the integer vs. non-integer rendering modes.
</span><span class="cx"> float roundedAdvance = roundf(advance);
</span><del>- if (!fontData->isSystemFont()) {
</del><ins>+ if (!fontData->platformData().isSystemFont()) {
</ins><span class="cx"> advance = roundedAdvance;
</span><span class="cx"> offsetX = roundf(offsetX);
</span><span class="cx"> offsetY = roundf(offsetY);
</span></span></pre>
</div>
</div>
</body>
</html>