<!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>[208894] 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/208894">208894</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-11-18 13:55:09 -0800 (Fri, 18 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unsupported emoji are invisible
https://bugs.webkit.org/show_bug.cgi?id=164944
<rdar://problem/28591608>
Reviewed by Dean Jackson.
Source/WebCore:
In WidthIterator, we explicitly skip characters which the OS has no font
to render with. However, for emoji, we should draw something to show that
there is missing content. Because we have nothing to draw, we can draw
the .notdef glyph (empty box, or "tofu").
Test: fast/text/emoji-draws.html
* platform/graphics/WidthIterator.cpp:
(WebCore::characterMustDrawSomething):
(WebCore::WidthIterator::advanceInternal):
LayoutTests:
* fast/text/emoji-draws-expected-mismatch.html: Added.
* fast/text/emoji-draws.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="#trunkSourceWebCoreplatformgraphicsWidthIteratorcpp">trunk/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextemojidrawsexpectedmismatchhtml">trunk/LayoutTests/fast/text/emoji-draws-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextemojidrawshtml">trunk/LayoutTests/fast/text/emoji-draws.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208893 => 208894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-18 21:47:42 UTC (rev 208893)
+++ trunk/LayoutTests/ChangeLog 2016-11-18 21:55:09 UTC (rev 208894)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-18 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unsupported emoji are invisible
+ https://bugs.webkit.org/show_bug.cgi?id=164944
+ <rdar://problem/28591608>
+
+ Reviewed by Dean Jackson.
+
+ * fast/text/emoji-draws-expected-mismatch.html: Added.
+ * fast/text/emoji-draws.html: Added.
+
</ins><span class="cx"> 2016-11-18 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Add support for record types
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextemojidrawsexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/emoji-draws-expected-mismatch.html (0 => 208894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/emoji-draws-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/text/emoji-draws-expected-mismatch.html 2016-11-18 21:55:09 UTC (rev 208894)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextemojidrawshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/emoji-draws.html (0 => 208894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/emoji-draws.html (rev 0)
+++ trunk/LayoutTests/fast/text/emoji-draws.html 2016-11-18 21:55:09 UTC (rev 208894)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="font: 100px 'Apple Color Emoji'";>&#x1f988;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208893 => 208894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-18 21:47:42 UTC (rev 208893)
+++ trunk/Source/WebCore/ChangeLog 2016-11-18 21:55:09 UTC (rev 208894)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-11-18 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unsupported emoji are invisible
+ https://bugs.webkit.org/show_bug.cgi?id=164944
+ <rdar://problem/28591608>
+
+ Reviewed by Dean Jackson.
+
+ In WidthIterator, we explicitly skip characters which the OS has no font
+ to render with. However, for emoji, we should draw something to show that
+ there is missing content. Because we have nothing to draw, we can draw
+ the .notdef glyph (empty box, or "tofu").
+
+ Test: fast/text/emoji-draws.html
+
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::characterMustDrawSomething):
+ (WebCore::WidthIterator::advanceInternal):
+
</ins><span class="cx"> 2016-11-18 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebIDL] Add support for record types
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (208893 => 208894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2016-11-18 21:47:42 UTC (rev 208893)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp 2016-11-18 21:55:09 UTC (rev 208894)
</span><span class="lines">@@ -162,6 +162,13 @@
</span><span class="cx"> return std::make_pair(expandLeft, expandRight);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool characterMustDrawSomething(UChar32 character)
+{
+ // u_hasBinaryProperty(character, UCHAR_EMOJI) would be better to use, but many OSes which
+ // WebKit runs on only have ICU version 55.1 or earlier. UCHAR_EMOJI was added in ICU 57.
+ return character >= 0x1F900 && character <= 0x1F9FF;
+}
+
</ins><span class="cx"> template <typename TextIterator>
</span><span class="cx"> inline unsigned WidthIterator::advanceInternal(TextIterator& textIterator, GlyphBuffer* glyphBuffer)
</span><span class="cx"> {
</span><span class="lines">@@ -195,11 +202,11 @@
</span><span class="cx"> int currentCharacter = textIterator.currentIndex();
</span><span class="cx"> const GlyphData& glyphData = m_font->glyphDataForCharacter(character, rtl);
</span><span class="cx"> Glyph glyph = glyphData.glyph;
</span><del>- if (!glyph) {
</del><ins>+ if (!glyph && !characterMustDrawSomething(character)) {
</ins><span class="cx"> textIterator.advance(advanceLength);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- const Font* font = glyphData.font;
</del><ins>+ const Font* font = glyphData.font ? glyphData.font : &m_font->primaryFont();
</ins><span class="cx"> ASSERT(font);
</span><span class="cx">
</span><span class="cx"> // Now that we have a glyph and font data, get its width.
</span></span></pre>
</div>
</div>
</body>
</html>