<!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>[186809] 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/186809">186809</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-07-14 12:50:37 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/177876">r177876</a>): store.apple.com profile and cart icons are missing
https://bugs.webkit.org/show_bug.cgi?id=146894
Patch by Antti Koivisto <antti@apple.com> on 2015-07-14
Reviewed by Myles C. Maxfield.
Source/WebCore:
If we had several @font-face rules for the same face covering overlapping ranges we
would only try to get glyphs from the first one. If it didn't have the glyph we wouldn't
try the other ones.
Test: fast/css/font-face-multiple-missing-glyphs.html
* platform/graphics/FontCascadeFonts.cpp:
(WebCore::FontCascadeFonts::glyphDataForVariant):
(WebCore::FontCascadeFonts::glyphDataForNormalVariant):
Get GlyphData with one call.
* platform/graphics/FontRanges.cpp:
(WebCore::FontRanges::~FontRanges):
(WebCore::FontRanges::glyphDataForCharacter):
Check that we actually have a glyph in the font for the character before returning it.
(WebCore::FontRanges::fontForCharacter):
(WebCore::FontRanges::fontForFirstRange):
* platform/graphics/FontRanges.h:
(WebCore::FontRanges::size):
(WebCore::FontRanges::rangeAt):
LayoutTests:
* fast/css/font-face-multiple-missing-glyphs-expected.html: Added.
* fast/css/font-face-multiple-missing-glyphs.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="#trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp">trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontRangescpp">trunk/Source/WebCore/platform/graphics/FontRanges.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontRangesh">trunk/Source/WebCore/platform/graphics/FontRanges.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssfontfacemultiplemissingglyphsexpectedhtml">trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssfontfacemultiplemissingglyphshtml">trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/LayoutTests/ChangeLog 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-14 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r177876): store.apple.com profile and cart icons are missing
+ https://bugs.webkit.org/show_bug.cgi?id=146894
+
+ Reviewed by Myles C. Maxfield.
+
+ * fast/css/font-face-multiple-missing-glyphs-expected.html: Added.
+ * fast/css/font-face-multiple-missing-glyphs.html: Added.
+
</ins><span class="cx"> 2015-07-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Fix if-domain and unless-domain when loading main documents.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontfacemultiplemissingglyphsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html (0 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+This test makes sure we search through all font-face declarations in order to find a working font.
+<div style="font: 200px 'Heiti SC'; -webkit-line-box-contain: font;">&#x6c49;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssfontfacemultiplemissingglyphshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html (0 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html (rev 0)
+++ trunk/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: WebFont;
+ /* Any font which has a smaller ascent than Heiti SC can be used here */
+ src: local("Palatino-Roman");
+}
+
+@font-face {
+ font-family: WebFont;
+ /* This font must not be the default fallback font for U+6c49 */
+ src: local("Heiti SC");
+}
+
+@font-face {
+ font-family: WebFont;
+ src: local("Palatino-Roman");
+}
+</style>
+</head>
+<body>
+This test makes sure we search through all font-face declarations in order to find a working font.
+<div style="font: 200px WebFont; -webkit-line-box-contain: font;">&#x6c49;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-07-14 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r177876): store.apple.com profile and cart icons are missing
+ https://bugs.webkit.org/show_bug.cgi?id=146894
+
+ Reviewed by Myles C. Maxfield.
+
+ If we had several @font-face rules for the same face covering overlapping ranges we
+ would only try to get glyphs from the first one. If it didn't have the glyph we wouldn't
+ try the other ones.
+
+ Test: fast/css/font-face-multiple-missing-glyphs.html
+
+ * platform/graphics/FontCascadeFonts.cpp:
+ (WebCore::FontCascadeFonts::glyphDataForVariant):
+ (WebCore::FontCascadeFonts::glyphDataForNormalVariant):
+
+ Get GlyphData with one call.
+
+ * platform/graphics/FontRanges.cpp:
+ (WebCore::FontRanges::~FontRanges):
+ (WebCore::FontRanges::glyphDataForCharacter):
+
+ Check that we actually have a glyph in the font for the character before returning it.
+
+ (WebCore::FontRanges::fontForCharacter):
+ (WebCore::FontRanges::fontForFirstRange):
+ * platform/graphics/FontRanges.h:
+ (WebCore::FontRanges::size):
+ (WebCore::FontRanges::rangeAt):
+
</ins><span class="cx"> 2015-07-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Fix if-domain and unless-domain when loading main documents.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -295,8 +295,7 @@
</span><span class="cx"> auto& fontRanges = realizeFallbackRangesAt(description, fallbackIndex++);
</span><span class="cx"> if (fontRanges.isNull())
</span><span class="cx"> break;
</span><del>- auto* font = fontRanges.fontForCharacter(c);
- GlyphData data = font ? font->glyphDataForCharacter(c) : GlyphData();
</del><ins>+ GlyphData data = fontRanges.glyphDataForCharacter(c);
</ins><span class="cx"> if (data.font) {
</span><span class="cx"> // The variantFont function should not normally return 0.
</span><span class="cx"> // But if it does, we will just render the capital letter big.
</span><span class="lines">@@ -313,17 +312,11 @@
</span><span class="cx">
</span><span class="cx"> GlyphData FontCascadeFonts::glyphDataForNormalVariant(UChar32 c, const FontDescription& description)
</span><span class="cx"> {
</span><del>- const unsigned pageNumber = c / GlyphPage::size;
-
- for (unsigned fallbackIndex = 0; true; ++fallbackIndex) {
</del><ins>+ for (unsigned fallbackIndex = 0; ; ++fallbackIndex) {
</ins><span class="cx"> auto& fontRanges = realizeFallbackRangesAt(description, fallbackIndex);
</span><span class="cx"> if (fontRanges.isNull())
</span><span class="cx"> break;
</span><del>- auto* font = fontRanges.fontForCharacter(c);
- auto* page = font ? font->glyphPage(pageNumber) : nullptr;
- if (!page)
- continue;
- GlyphData data = page->glyphDataForCharacter(c);
</del><ins>+ GlyphData data = fontRanges.glyphDataForCharacter(c);
</ins><span class="cx"> if (data.font) {
</span><span class="cx"> if (data.font->platformData().orientation() == Vertical && !data.font->isTextOrientationFallback()) {
</span><span class="cx"> if (!FontCascade::isCJKIdeographOrSymbol(c))
</span><span class="lines">@@ -339,7 +332,6 @@
</span><span class="cx"> return glyphDataForCJKCharacterWithoutSyntheticItalic(c, data);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return data;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontRangescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontRanges.cpp (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontRanges.cpp 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/Source/WebCore/platform/graphics/FontRanges.cpp 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -46,15 +46,23 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const Font* FontRanges::fontForCharacter(UChar32 c) const
</del><ins>+GlyphData FontRanges::glyphDataForCharacter(UChar32 character) const
</ins><span class="cx"> {
</span><span class="cx"> for (auto& range : m_ranges) {
</span><del>- if (range.from() <= c && c <= range.to())
- return &range.font();
</del><ins>+ if (range.from() <= character && character <= range.to()) {
+ auto glyphData = range.font().glyphDataForCharacter(character);
+ if (glyphData.glyph)
+ return glyphData;
+ }
</ins><span class="cx"> }
</span><del>- return nullptr;
</del><ins>+ return GlyphData();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+const Font* FontRanges::fontForCharacter(UChar32 character) const
+{
+ return glyphDataForCharacter(character).font;
+}
+
</ins><span class="cx"> const Font& FontRanges::fontForFirstRange() const
</span><span class="cx"> {
</span><span class="cx"> return m_ranges[0].font();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontRangesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontRanges.h (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontRanges.h 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/Source/WebCore/platform/graphics/FontRanges.h 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> unsigned size() const { return m_ranges.size(); }
</span><span class="cx"> const Range& rangeAt(unsigned i) const { return m_ranges[i]; }
</span><span class="cx">
</span><ins>+ GlyphData glyphDataForCharacter(UChar32) const;
</ins><span class="cx"> WEBCORE_EXPORT const Font* fontForCharacter(UChar32) const;
</span><span class="cx"> WEBCORE_EXPORT const Font& fontForFirstRange() const;
</span><span class="cx"> bool isLoading() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (186808 => 186809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-07-14 17:37:55 UTC (rev 186808)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-07-14 19:50:37 UTC (rev 186809)
</span><span class="lines">@@ -82,16 +82,17 @@
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+/*
</ins><span class="cx"> static bool canUseForText(const RenderText& textRenderer, const Font& font)
</span><span class="cx"> {
</span><span class="cx"> if (textRenderer.is8Bit())
</span><span class="cx"> return canUseForText(textRenderer.characters8(), textRenderer.textLength(), font);
</span><span class="cx"> return canUseForText(textRenderer.characters16(), textRenderer.textLength(), font);
</span><span class="cx"> }
</span><del>-
-bool canUseFor(const RenderBlockFlow& flow)
</del><ins>+*/
+bool canUseFor(const RenderBlockFlow&)
</ins><span class="cx"> {
</span><ins>+ return false; /*
</ins><span class="cx"> if (!flow.frame().settings().simpleLineLayoutEnabled())
</span><span class="cx"> return false;
</span><span class="cx"> if (!flow.firstChild())
</span><span class="lines">@@ -211,6 +212,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><ins>+ */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static float computeLineLeft(ETextAlign textAlign, float availableWidth, float committedWidth, float logicalLeftOffset)
</span></span></pre>
</div>
</div>
</body>
</html>