<!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>[193869] branches/safari-601.1.46-branch</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/193869">193869</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-09 14:39:46 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192639">r192639</a>. rdar://problem/23814338</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadecpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderCombineTextcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasttextresourcestatechuyokosvg">branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/tatechuyoko.svg</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttexttextcombineplacementexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttexttextcombineplacementhtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193868 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-09 22:39:42 UTC (rev 193868)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192639. rdar://problem/23814338
+
+ 2015-11-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Tatechuyoko in ruby sits too high
+ https://bugs.webkit.org/show_bug.cgi?id=151309
+ <rdar://problem/23536621>
+
+ Reviewed by Darin Adler.
+
+ * fast/text/resources/tatechuyoko.svg: Added.
+ * fast/text/text-combine-placement-expected.html: Added.
+ * fast/text/text-combine-placement.html: Added.
+
+2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r192388. rdar://problem/23814336
</span><span class="cx">
</span><span class="cx"> 2015-11-12 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextresourcestatechuyokosvg"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/tatechuyoko.svg (0 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/tatechuyoko.svg (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/resources/tatechuyoko.svg 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<?xml version="1.0" standalone="yes"?>
+<svg version="1.1" viewBox="0 0 160 160" xmlns = 'http://www.w3.org/2000/svg' xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <font id="Litherum" horiz-adv-x="1024">
+ <font-face units-per-em="1024" ascent="512" descent="512">
+ </font-face>
+ <glyph unicode="A" horiz-adv-x="256" d="m 0 0 v 128 h 128 v -128 z"/>
+ <glyph unicode="&#x306e;" horiz-adv-x="256" d="m 0 0 v 128 h 128 v -128 z"/>
+ </font>
+ </defs>
+</svg>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttexttextcombineplacementexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement-expected.html (0 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement-expected.html 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Litherum";
+ src: url("resources/tatechuyoko.svg#Litherum") format("svg");
+}
+</style>
+</head>
+<body>
+<p>This test makes sure that tatechuyoko glyphs are centered correctly within the space left for them. The test is successful if the three boxes on the left have the same vertical positions as the three boxes on the right. The two vertically-middle boxes should be vertically centered between the four corner boxes.</p>
+<p>Note that the boxes' horizontal spacing is irrelevant here. We are only interested in vertical spacing.</p>
+<div style="-webkit-writing-mode: vertical-rl;">
+<div><span style="font: 32px Ahem;">A</span><span style="font: 256px Litherum; -webkit-text-combine: horizontal;">A</span><span style="font: 32px Ahem;">A</span></div>
+<div><span style="font: 32px Ahem;">A</span><span style="font: 256px Litherum; -webkit-text-combine: horizontal;">A</span><span style="font: 32px Ahem;">A</span></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttexttextcombineplacementhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement.html (0 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/text-combine-placement.html 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Litherum";
+ src: url("resources/tatechuyoko.svg#Litherum") format("svg");
+}
+</style>
+</head>
+<body>
+<p>This test makes sure that tatechuyoko glyphs are centered correctly within the space left for them. The test is successful if the three boxes on the left have the same vertical positions as the three boxes on the right. The two vertically-middle boxes should be vertically centered between the four corner boxes.</p>
+<p>Note that the boxes' horizontal spacing is irrelevant here. We are only interested in vertical spacing.</p>
+<div style="-webkit-writing-mode: vertical-rl;">
+<div><span style="font: 32px Ahem;">A</span><span style="font: 256px Litherum; -webkit-text-combine: horizontal;">A</span><span style="font: 32px Ahem;">A</span></div>
+<div><span style="font: 32px Ahem;">A</span><span style="font: 256px Litherum; -webkit-text-combine: horizontal;">&#x306e;</span><span style="font: 32px Ahem;">A</span></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193868 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-09 22:39:42 UTC (rev 193868)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192639. rdar://problem/23814338
+
+ 2015-11-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Tatechuyoko in ruby sits too high
+ https://bugs.webkit.org/show_bug.cgi?id=151309
+ <rdar://problem/23536621>
+
+ Reviewed by Darin Adler.
+
+ When combining text, we ask what the text's width is in order to determine if it fits in the
+ column. However, when we do that, we were not setting the font's orientation to horizontal.
+ This means that, for CJK text, the "width" which was returned was actually the height of the
+ glyph, and the GlyphOverflow data was similarly garbled.
+
+ We actually already were creating a corrected FontDescription, and using it in two places.
+ However, we weren't using it in the last place, which was causing this bug.
+
+ Test: fast/text/text-combine-placement.html
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::width):
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::combineText):
+
+2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r192388. rdar://problem/23814336
</span><span class="cx">
</span><span class="cx"> 2015-11-12 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193868 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-09 22:39:42 UTC (rev 193868)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -368,10 +368,10 @@
</span><span class="cx"> if (codePathToUse != Complex) {
</span><span class="cx"> // The complex path is more restrictive about returning fallback fonts than the simple path, so we need an explicit test to make their behaviors match.
</span><span class="cx"> if (!canReturnFallbackFontsForComplexText())
</span><del>- fallbackFonts = 0;
</del><ins>+ fallbackFonts = nullptr;
</ins><span class="cx"> // The simple path can optimize the case where glyph overflow is not observable.
</span><span class="cx"> if (codePathToUse != SimpleWithGlyphOverflow && (glyphOverflow && !glyphOverflow->computeBounds))
</span><del>- glyphOverflow = 0;
</del><ins>+ glyphOverflow = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasWordSpacingOrLetterSpacing = wordSpacing() || letterSpacing();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp (193868 => 193869)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp 2015-12-09 22:39:42 UTC (rev 193868)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderCombineText.cpp 2015-12-09 22:39:46 UTC (rev 193869)
</span><span class="lines">@@ -117,20 +117,22 @@
</span><span class="cx"> float emWidth = description.computedSize() * textCombineMargin;
</span><span class="cx"> bool shouldUpdateFont = false;
</span><span class="cx">
</span><ins>+ FontSelector* fontSelector = style().fontCascade().fontSelector();
+
</ins><span class="cx"> description.setOrientation(Horizontal); // We are going to draw combined text horizontally.
</span><ins>+
+ FontCascade horizontalFont(description, style().fontCascade().letterSpacing(), style().fontCascade().wordSpacing());
+ horizontalFont.update(fontSelector);
</ins><span class="cx">
</span><span class="cx"> GlyphOverflow glyphOverflow;
</span><span class="cx"> glyphOverflow.computeBounds = true;
</span><del>-
- float combinedTextWidth = width(0, textLength(), originalFont(), 0, nullptr, &glyphOverflow);
</del><ins>+ float combinedTextWidth = width(0, textLength(), horizontalFont, 0, nullptr, &glyphOverflow);
</ins><span class="cx">
</span><span class="cx"> float bestFitDelta = combinedTextWidth - emWidth;
</span><span class="cx"> auto bestFitDescription = description;
</span><span class="cx">
</span><span class="cx"> m_isCombined = combinedTextWidth <= emWidth;
</span><span class="cx">
</span><del>- FontSelector* fontSelector = style().fontCascade().fontSelector();
-
</del><span class="cx"> if (m_isCombined)
</span><span class="cx"> shouldUpdateFont = m_combineFontStyle->setFontDescription(description); // Need to change font orientation to horizontal.
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>