<!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>[178831] branches/safari-600.1.4.15-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/178831">178831</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:25:56 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176372">r176372</a>. rdar://problem/19419916</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsGlyphPageh">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/GlyphPage.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprightexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprighthtml">branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsplatformmacfasttextresourcesmultiplecodeunitverticaluprightotf">branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (178830 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-21 18:24:47 UTC (rev 178830)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176372.
+
+ 2014-11-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Upright vertical text is completely broken for multi-code-unit codepoints
+ https://bugs.webkit.org/show_bug.cgi?id=138891
+
+ Reviewed by Dan Bernstein.
+
+ Make sure a single upright vertical multi-code-unit codepoint is rendered the same as
+ the same codepoint rendered horizontally.
+
+ * platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html: Added.
+ * platform/mac/fast/text/multiple-codeunit-vertical-upright.html: Added.
+ * platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf: Added.
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r176354.
</span><span class="cx">
</span><span class="cx"> 2014-11-19 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprightexpectedhtmlfromrev176372trunkLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprightexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html (from rev 176372, trunk/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html) (0 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright-expected.html 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Litherum";
+ src: url("resources/multiple-codeunit-vertical-upright.otf") format("opentype");
+}
+</style>
+</head>
+<body style="-webkit-font-smoothing: none;">
+<div style="font: 96px Litherum; position: relative; left: 3.5px; top: 1px;">&#x2000b;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprighthtmlfromrev176372trunkLayoutTestsplatformmacfasttextmultiplecodeunitverticaluprighthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html (from rev 176372, trunk/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html) (0 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/multiple-codeunit-vertical-upright.html 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Litherum";
+ src: url("resources/multiple-codeunit-vertical-upright.otf") format("opentype");
+}
+</style>
+</head>
+<body style="-webkit-font-smoothing: none;">
+<div style="font: 96px Litherum; -webkit-writing-mode: vertical-rl; -webkit-text-orientation: upright;">&#x2000b;</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsplatformmacfasttextresourcesmultiplecodeunitverticaluprightotffromrev176372trunkLayoutTestsplatformmacfasttextresourcesmultiplecodeunitverticaluprightotf"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf (from rev 176372, trunk/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf) (0 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/mac/fast/text/resources/multiple-codeunit-vertical-upright.otf 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+OTTO\x80`CFF :\x92\xDA\xEC\xBFGSUBU\xAC\xA8OS/2PW\BTDVORG\x98cmapQ\xA04head\xECA\xDAa\xD46hhea;
+/ $hmtx0kern\xFF8&maxp\xFE` name\x80post\x94 vheas\xB4$vmtx \xD8. \x87 \x87 \xC8 \xF4 T WZ\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xF4\xFF\xC8\xFF\xFF\xFF\xFE \xFF\xFF8\xFF
+$Varabfinamedi init&rlig,
+" "$&TKBW\xFF\xFF ( \xE2C\\xD9_<\xF5\xC8\xF4f8\xC8\xFF\xFA\xFF\xFA\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFEf
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178830 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:24:47 UTC (rev 178830)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176372.
+
+ 2014-11-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Upright vertical text is completely broken for multi-code-unit codepoints
+ https://bugs.webkit.org/show_bug.cgi?id=138891
+
+ Reviewed by Dan Bernstein.
+
+ We were assuming that we can use the string index (in UTF-16) as the glyph
+ index. This falls down when a single codepoint (and glyph) contians
+ multiple code units.
+
+ Test: platform/mac/fast/text/multiple-codeunit-vertical-upright.html
+
+ * platform/graphics/GlyphPage.h:
+ * platform/graphics/mac/GlyphPageTreeNodeMac.cpp:
+ (WebCore::GlyphPage::fill):
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r176354.
</span><span class="cx">
</span><span class="cx"> 2014-11-19 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsGlyphPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/GlyphPage.h (178830 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/GlyphPage.h 2015-01-21 18:24:47 UTC (rev 178830)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/GlyphPage.h 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -98,6 +98,7 @@
</span><span class="cx"> ~GlyphPage() { }
</span><span class="cx">
</span><span class="cx"> static const size_t size = 256; // Covers Latin-1 in a single page.
</span><ins>+ static_assert((!(0xD800 % size)) && (!(0xDC00 % size)) && (!(0xE000 % size)), "GlyphPages must never straddle code-unit length boundaries");
</ins><span class="cx"> static unsigned indexForCharacter(UChar32 c) { return c % GlyphPage::size; }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE GlyphData glyphDataForCharacter(UChar32 c) const
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsmacGlyphPageTreeNodeMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp (178830 => 178831)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2015-01-21 18:24:47 UTC (rev 178830)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp 2015-01-21 18:25:56 UTC (rev 178831)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) {
</span><span class="cx"> // When buffer consists of surrogate pairs, wkGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters
</span><span class="cx"> // place the glyphs at indices corresponding to the first character of each pair.
</span><ins>+ ASSERT(!(bufferLength % length) && (bufferLength / length == 1 || bufferLength / length == 2));
</ins><span class="cx"> unsigned glyphStep = bufferLength / length;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (!glyphs[i * glyphStep])
</span><span class="lines">@@ -148,14 +149,18 @@
</span><span class="cx"> stringIndices = indexVector.data();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // When buffer consists of surrogate pairs, CTRunGetStringIndicesPtr and CTRunGetStringIndices
+ // place the glyphs at indices corresponding to the first character of each pair.
+ ASSERT(!(bufferLength % length) && (bufferLength / length == 1 || bufferLength / length == 2));
+ unsigned glyphStep = bufferLength / length;
</ins><span class="cx"> if (gotBaseFont) {
</span><span class="cx"> for (CFIndex i = 0; i < glyphCount; ++i) {
</span><del>- if (stringIndices[i] >= static_cast<CFIndex>(length)) {
</del><ins>+ if (stringIndices[i] >= static_cast<CFIndex>(bufferLength)) {
</ins><span class="cx"> done = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (glyphs[i]) {
</span><del>- setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], fontData);
</del><ins>+ setGlyphDataForIndex(offset + (stringIndices[i] / glyphStep), glyphs[i], fontData);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -164,12 +169,12 @@
</span><span class="cx"> const SimpleFontData* runSimple = fontData->getCompositeFontReferenceFontData((NSFont *)runFont);
</span><span class="cx"> if (runSimple) {
</span><span class="cx"> for (CFIndex i = 0; i < glyphCount; ++i) {
</span><del>- if (stringIndices[i] >= static_cast<CFIndex>(length)) {
</del><ins>+ if (stringIndices[i] >= static_cast<CFIndex>(bufferLength)) {
</ins><span class="cx"> done = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (glyphs[i]) {
</span><del>- setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], runSimple);
</del><ins>+ setGlyphDataForIndex(offset + (stringIndices[i] / glyphStep), glyphs[i], runSimple);
</ins><span class="cx"> haveGlyphs = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>