<!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>[191386] trunk/Source/WebCore</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/191386">191386</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-21 05:52:17 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: markFontData in FontCascade::emphasisMarkHeight
https://bugs.webkit.org/show_bug.cgi?id=150171
Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2015-10-21
Reviewed by Myles C. Maxfield.
It happens with several tests like fast/ruby/text-emphasis.html in
the GTK Debug bot. The tests seem to pass in Release and the rendering
looks correct as well removing the assert. The thing is that
for some reason we can get an empty GlyphData from
FontCascade::getEmphasisMarkGlyphData() when it ends up falling
back to system (FontCascadeFonts::glyphDataForSystemFallback).
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::getEmphasisMarkGlyphData): Return
Optional<GlyphData> instead of returning a boolean and an out
parameter. If we get an invalid GlyphData, Nullopt is
returned. Also use a SurrogatePairAwareTextIterator to handle
surrogate pairs.
(WebCore::FontCascade::emphasisMarkAscent):
(WebCore::FontCascade::emphasisMarkDescent):
(WebCore::FontCascade::emphasisMarkHeight):
(WebCore::FontCascade::drawEmphasisMarks):
* platform/graphics/FontCascade.h:
* platform/graphics/GlyphPage.h:
(WebCore::GlyphData::isValid): Return whether the GlyphData is valid.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGlyphPageh">trunk/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191385 => 191386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-21 11:47:16 UTC (rev 191385)
+++ trunk/Source/WebCore/ChangeLog 2015-10-21 12:52:17 UTC (rev 191386)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-10-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ ASSERTION FAILED: markFontData in FontCascade::emphasisMarkHeight
+ https://bugs.webkit.org/show_bug.cgi?id=150171
+
+ Reviewed by Myles C. Maxfield.
+
+ It happens with several tests like fast/ruby/text-emphasis.html in
+ the GTK Debug bot. The tests seem to pass in Release and the rendering
+ looks correct as well removing the assert. The thing is that
+ for some reason we can get an empty GlyphData from
+ FontCascade::getEmphasisMarkGlyphData() when it ends up falling
+ back to system (FontCascadeFonts::glyphDataForSystemFallback).
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::getEmphasisMarkGlyphData): Return
+ Optional<GlyphData> instead of returning a boolean and an out
+ parameter. If we get an invalid GlyphData, Nullopt is
+ returned. Also use a SurrogatePairAwareTextIterator to handle
+ surrogate pairs.
+ (WebCore::FontCascade::emphasisMarkAscent):
+ (WebCore::FontCascade::emphasisMarkDescent):
+ (WebCore::FontCascade::emphasisMarkHeight):
+ (WebCore::FontCascade::drawEmphasisMarks):
+ * platform/graphics/FontCascade.h:
+ * platform/graphics/GlyphPage.h:
+ (WebCore::GlyphData::isValid): Return whether the GlyphData is valid.
+
</ins><span class="cx"> 2015-10-20 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Fix availableLogicalSpace computation with non-zero baseSize flex tracks
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (191385 => 191386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-10-21 11:47:16 UTC (rev 191385)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-10-21 12:52:17 UTC (rev 191386)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "FontCache.h"
</span><span class="cx"> #include "GlyphBuffer.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><ins>+#include "SurrogatePairAwareTextIterator.h"
</ins><span class="cx"> #include "TextRun.h"
</span><span class="cx"> #include "WidthIterator.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -1197,38 +1198,31 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This function may not work if the emphasis mark uses a complex script, but none of the
</span><span class="cx"> // standard emphasis marks do so.
</span><del>-bool FontCascade::getEmphasisMarkGlyphData(const AtomicString& mark, GlyphData& glyphData) const
</del><ins>+Optional<GlyphData> FontCascade::getEmphasisMarkGlyphData(const AtomicString& mark) const
</ins><span class="cx"> {
</span><span class="cx"> if (mark.isEmpty())
</span><del>- return false;
</del><ins>+ return Nullopt;
</ins><span class="cx">
</span><del>- UChar32 character = mark[0];
</del><ins>+ UChar32 character;
+ if (!mark.is8Bit()) {
+ SurrogatePairAwareTextIterator iterator(mark.characters16(), 0, mark.length(), mark.length());
+ unsigned clusterLength;
+ if (!iterator.consume(character, clusterLength))
+ return Nullopt;
+ } else
+ character = mark[0];
</ins><span class="cx">
</span><del>- if (U16_IS_SURROGATE(character)) {
- if (!U16_IS_SURROGATE_LEAD(character))
- return false;
-
- if (mark.length() < 2)
- return false;
-
- UChar low = mark[1];
- if (!U16_IS_TRAIL(low))
- return false;
-
- character = U16_GET_SUPPLEMENTARY(character, low);
- }
-
- glyphData = glyphDataForCharacter(character, false, EmphasisMarkVariant);
- return true;
</del><ins>+ Optional<GlyphData> glyphData(glyphDataForCharacter(character, false, EmphasisMarkVariant));
+ return glyphData.value().isValid() ? glyphData : Nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkAscent(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- GlyphData markGlyphData;
- if (!getEmphasisMarkGlyphData(mark, markGlyphData))
</del><ins>+ Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
+ if (!markGlyphData)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const Font* markFontData = markGlyphData.font;
</del><ins>+ const Font* markFontData = markGlyphData.value().font;
</ins><span class="cx"> ASSERT(markFontData);
</span><span class="cx"> if (!markFontData)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1238,11 +1232,11 @@
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkDescent(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- GlyphData markGlyphData;
- if (!getEmphasisMarkGlyphData(mark, markGlyphData))
</del><ins>+ Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
+ if (!markGlyphData)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const Font* markFontData = markGlyphData.font;
</del><ins>+ const Font* markFontData = markGlyphData.value().font;
</ins><span class="cx"> ASSERT(markFontData);
</span><span class="cx"> if (!markFontData)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1252,11 +1246,11 @@
</span><span class="cx">
</span><span class="cx"> int FontCascade::emphasisMarkHeight(const AtomicString& mark) const
</span><span class="cx"> {
</span><del>- GlyphData markGlyphData;
- if (!getEmphasisMarkGlyphData(mark, markGlyphData))
</del><ins>+ Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
+ if (!markGlyphData)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><del>- const Font* markFontData = markGlyphData.font;
</del><ins>+ const Font* markFontData = markGlyphData.value().font;
</ins><span class="cx"> ASSERT(markFontData);
</span><span class="cx"> if (!markFontData)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1389,16 +1383,16 @@
</span><span class="cx">
</span><span class="cx"> void FontCascade::drawEmphasisMarks(GraphicsContext& context, const TextRun& run, const GlyphBuffer& glyphBuffer, const AtomicString& mark, const FloatPoint& point) const
</span><span class="cx"> {
</span><del>- GlyphData markGlyphData;
- if (!getEmphasisMarkGlyphData(mark, markGlyphData))
</del><ins>+ Optional<GlyphData> markGlyphData = getEmphasisMarkGlyphData(mark);
+ if (!markGlyphData)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- const Font* markFontData = markGlyphData.font;
</del><ins>+ const Font* markFontData = markGlyphData.value().font;
</ins><span class="cx"> ASSERT(markFontData);
</span><span class="cx"> if (!markFontData)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Glyph markGlyph = markGlyphData.glyph;
</del><ins>+ Glyph markGlyph = markGlyphData.value().glyph;
</ins><span class="cx"> Glyph spaceGlyph = markFontData->spaceGlyph();
</span><span class="cx">
</span><span class="cx"> float middleOfLastGlyph = offsetToMiddleOfGlyphAtIndex(glyphBuffer, 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (191385 => 191386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-10-21 11:47:16 UTC (rev 191385)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-10-21 12:52:17 UTC (rev 191386)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "TextFlags.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx">
</span><span class="lines">@@ -231,7 +232,7 @@
</span><span class="cx"> int offsetForPositionForSimpleText(const TextRun&, float position, bool includePartialGlyphs) const;
</span><span class="cx"> void adjustSelectionRectForSimpleText(const TextRun&, LayoutRect& selectionRect, int from, int to) const;
</span><span class="cx">
</span><del>- bool getEmphasisMarkGlyphData(const AtomicString&, GlyphData&) const;
</del><ins>+ Optional<GlyphData> getEmphasisMarkGlyphData(const AtomicString&) const;
</ins><span class="cx">
</span><span class="cx"> static bool canReturnFallbackFontsForComplexText();
</span><span class="cx"> static bool canExpandAroundIdeographsInComplexText();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GlyphPage.h (191385 => 191386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-10-21 11:47:16 UTC (rev 191385)
+++ trunk/Source/WebCore/platform/graphics/GlyphPage.h 2015-10-21 12:52:17 UTC (rev 191386)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> , font(f)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+ bool isValid() const { return glyph || font; }
+
</ins><span class="cx"> Glyph glyph;
</span><span class="cx"> const Font* font;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>