<!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>[211667] 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/211667">211667</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-02-03 21:53:39 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/204858">r204858</a>): Synthetic bold text in vertical writing mode is rotated away from original text
https://bugs.webkit.org/show_bug.cgi?id=167826
<rdar://problem/28193222>
Reviewed by Zalan Bujtas.
Source/WebCore:
When drawing vertical text, the rotation is not reset between successive paint calls. We implement
synthetic bold by drawing text twice, which means that the second draw call was getting rotated
twice. This was an oversight in <a href="http://trac.webkit.org/projects/webkit/changeset/204858">r204858</a>.
Test: fast/text/synthetic-bold-vertical-text.html
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::showGlyphsWithAdvances):
LayoutTests:
* fast/text/synthetic-bold-vertical-text-expected.html: Added.
* fast/text/synthetic-bold-vertical-text.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="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsyntheticboldverticaltextexpectedhtml">trunk/LayoutTests/fast/text/synthetic-bold-vertical-text-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextsyntheticboldverticaltexthtml">trunk/LayoutTests/fast/text/synthetic-bold-vertical-text.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211666 => 211667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-04 05:18:18 UTC (rev 211666)
+++ trunk/LayoutTests/ChangeLog 2017-02-04 05:53:39 UTC (rev 211667)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(r204858): Synthetic bold text in vertical writing mode is rotated away from original text
+ https://bugs.webkit.org/show_bug.cgi?id=167826
+ <rdar://problem/28193222>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/text/synthetic-bold-vertical-text-expected.html: Added.
+ * fast/text/synthetic-bold-vertical-text.html: Added.
+
</ins><span class="cx"> 2017-02-03 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1 mouse events are missing movementX and movementY for pointerlock.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsyntheticboldverticaltextexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/synthetic-bold-vertical-text-expected.html (0 => 211667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/synthetic-bold-vertical-text-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/synthetic-bold-vertical-text-expected.html 2017-02-04 05:53:39 UTC (rev 211667)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that synthetic bold on vertical text doesn't draw outside of the bounds of the line box. The test passes if you see nothing below.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsyntheticboldverticaltexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/synthetic-bold-vertical-text.html (0 => 211667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/synthetic-bold-vertical-text.html (rev 0)
+++ trunk/LayoutTests/fast/text/synthetic-bold-vertical-text.html 2017-02-04 05:53:39 UTC (rev 211667)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that synthetic bold on vertical text doesn't draw outside of the bounds of the line box. The test passes if you see nothing below.
+<div style="position: relative;">
+<div id="test" style="position: absolute; left: 50px; top: 50px; font-family: 'Hiragino Maru Gothic ProN'; writing-mode: vertical-rl; font-weight: bold">Hello</div>
+<div id="cover" style="position: absolute; left: 50px; top: 50px; width: 40px; height: 50vh; background: white;"></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211666 => 211667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-04 05:18:18 UTC (rev 211666)
+++ trunk/Source/WebCore/ChangeLog 2017-02-04 05:53:39 UTC (rev 211667)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ REGRESSION(r204858): Synthetic bold text in vertical writing mode is rotated away from original text
+ https://bugs.webkit.org/show_bug.cgi?id=167826
+ <rdar://problem/28193222>
+
+ Reviewed by Zalan Bujtas.
+
+ When drawing vertical text, the rotation is not reset between successive paint calls. We implement
+ synthetic bold by drawing text twice, which means that the second draw call was getting rotated
+ twice. This was an oversight in r204858.
+
+ Test: fast/text/synthetic-bold-vertical-text.html
+
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::showGlyphsWithAdvances):
+
</ins><span class="cx"> 2017-02-03 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Performance Timing: Convert WTF::MonotonicTime and WTF::Seconds
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (211666 => 211667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-02-04 05:18:18 UTC (rev 211666)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-02-04 05:53:39 UTC (rev 211667)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> CGAffineTransform rotateLeftTransform = CGAffineTransformMake(0, -1, 1, 0, 0, 0);
</span><span class="cx"> CGAffineTransform textMatrix = CGContextGetTextMatrix(context);
</span><span class="cx"> CGAffineTransform runMatrix = CGAffineTransformConcat(textMatrix, rotateLeftTransform);
</span><del>- CGContextSetTextMatrix(context, runMatrix);
</del><ins>+ ScopedTextMatrix savedMatrix(runMatrix, context);
</ins><span class="cx">
</span><span class="cx"> Vector<CGSize, 256> translations(count);
</span><span class="cx"> CTFontGetVerticalTranslationsForGlyphs(platformData.ctFont(), glyphs, translations.data(), count);
</span></span></pre>
</div>
</div>
</body>
</html>