<!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>[201228] 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/201228">201228</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 15:10:58 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/184899">r184899</a>): Ascent adjustments are applied to web fonts
https://bugs.webkit.org/show_bug.cgi?id=157954
<rdar://problem/24204349>
Reviewed by Dean Jackson.
Source/WebCore:
There are a few specific fonts which exist on Windows and Cocoa OSes, and we will adjust
the ascents of these fonts to better match their counterparts on Windows. However, in
<a href="http://trac.webkit.org/projects/webkit/changeset/184899">r184899</a>, we started applying this adjustment to web fonts too.
Test: fast/text/ascent-adjustment-webfont.html
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::platformInit):
* svg/SVGToOTFFontConversion.cpp: We were reporting the length of font names wrong, so
it made the test pass without this patch even when it shouldn't have. Previously, we
were recording the number of characters in the font, not the number of bytes (each
character is 2 bytes).
LayoutTests:
* fast/text/ascent-adjustment-webfont-expected-mismatch.html: Added.
* fast/text/ascent-adjustment-webfont.html: Added.
* fast/text/resources/Helvetica-light.svg: 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="#trunkSourceWebCoreplatformgraphicscocoaFontCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextascentadjustmentwebfontexpectedmismatchhtml">trunk/LayoutTests/fast/text/ascent-adjustment-webfont-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextascentadjustmentwebfonthtml">trunk/LayoutTests/fast/text/ascent-adjustment-webfont.html</a></li>
<li><a href="#trunkLayoutTestsfasttextresourcesHelvetica_lightsvg">trunk/LayoutTests/fast/text/resources/Helvetica_light.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201227 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-20 22:05:01 UTC (rev 201227)
+++ trunk/LayoutTests/ChangeLog 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-20 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] REGRESSION(r184899): Ascent adjustments are applied to web fonts
+ https://bugs.webkit.org/show_bug.cgi?id=157954
+ <rdar://problem/24204349>
+
+ Reviewed by Dean Jackson.
+
+ * fast/text/ascent-adjustment-webfont-expected-mismatch.html: Added.
+ * fast/text/ascent-adjustment-webfont.html: Added.
+ * fast/text/resources/Helvetica-light.svg: Added.
+
</ins><span class="cx"> 2016-05-20 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Drag cannot start if no drag data or custom data is available in the Pasteboard.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextascentadjustmentwebfontexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/ascent-adjustment-webfont-expected-mismatch.html (0 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/ascent-adjustment-webfont-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/text/ascent-adjustment-webfont-expected-mismatch.html 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<div style="position: absolute; left: 8px; top: 18px; font: 100px Helvetica">l</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextascentadjustmentwebfonthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/ascent-adjustment-webfont.html (0 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/ascent-adjustment-webfont.html (rev 0)
+++ trunk/LayoutTests/fast/text/ascent-adjustment-webfont.html 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "HelveticaLight";
+ src: url("resources/Helvetica_light.svg") format("svg");
+}
+</style>
+</head>
+<body>
+<!-- Inside Font::platformInit(), we adjust the ascent of some fonts to make them better match the metrics of their Windows counterparts. However, we should only do that for preinstalled fonts, not web fonts. Therefore, the ascent for a web font Helvetica should not be the same as for a preinstalled font Helvetica. -->
+<div style="position: absolute; left: 8px; top: 13px; font: 100px HelveticaLight">l</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextresourcesHelvetica_lightsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/resources/Helvetica_light.svg (0 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/resources/Helvetica_light.svg (rev 0)
+++ trunk/LayoutTests/fast/text/resources/Helvetica_light.svg 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs>
+<font id="HelveticaLight" horiz-adv-x="1024">
+<font-face units-per-em="2048" ascent="1577" descent="-471" font-family="Helvetica"/>
+<glyph unicode="l" horiz-adv-x="455" d="M137 1469H317V0H137z"/>
+</font>
+</defs>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201227 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-20 22:05:01 UTC (rev 201227)
+++ trunk/Source/WebCore/ChangeLog 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-20 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] REGRESSION(r184899): Ascent adjustments are applied to web fonts
+ https://bugs.webkit.org/show_bug.cgi?id=157954
+ <rdar://problem/24204349>
+
+ Reviewed by Dean Jackson.
+
+ There are a few specific fonts which exist on Windows and Cocoa OSes, and we will adjust
+ the ascents of these fonts to better match their counterparts on Windows. However, in
+ r184899, we started applying this adjustment to web fonts too.
+
+ Test: fast/text/ascent-adjustment-webfont.html
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformInit):
+ * svg/SVGToOTFFontConversion.cpp: We were reporting the length of font names wrong, so
+ it made the test pass without this patch even when it shouldn't have. Previously, we
+ were recording the number of characters in the font, not the number of bytes (each
+ character is 2 bytes).
+
</ins><span class="cx"> 2016-05-20 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary PageOverlay client function pageOverlayDestroyed
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (201227 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-05-20 22:05:01 UTC (rev 201227)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> // incorrectly added to line spacing, so we use a 15% adjustment instead
</span><span class="cx"> // and add it to the ascent.
</span><span class="cx"> RetainPtr<CFStringRef> familyName = adoptCF(CTFontCopyFamilyName(m_platformData.font()));
</span><del>- if (familyName && (CFStringCompare(familyName.get(), CFSTR("Times"), kCFCompareCaseInsensitive) == kCFCompareEqualTo
</del><ins>+ if (!m_isCustomFont && familyName && (CFStringCompare(familyName.get(), CFSTR("Times"), kCFCompareCaseInsensitive) == kCFCompareEqualTo
</ins><span class="cx"> || CFStringCompare(familyName.get(), CFSTR("Helvetica"), kCFCompareCaseInsensitive) == kCFCompareEqualTo
</span><span class="cx"> || CFStringCompare(familyName.get(), CFSTR("Courier"), kCFCompareCaseInsensitive) == kCFCompareEqualTo))
</span><span class="cx"> ascent += floorf(((ascent + descent) * 0.15f) + 0.5f);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (201227 => 201228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-05-20 22:05:01 UTC (rev 201227)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2016-05-20 22:10:58 UTC (rev 201228)
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx"> append16(3); // Unicode version 2.0 or later
</span><span class="cx"> append16(0); // Language
</span><span class="cx"> append16(1); // Name identifier. 1 = Font family
</span><del>- append16(m_fontFamily.length());
</del><ins>+ append16(m_fontFamily.length() * 2);
</ins><span class="cx"> append16(0); // Offset into name data
</span><span class="cx">
</span><span class="cx"> for (auto codeUnit : StringView(m_fontFamily).codeUnits())
</span></span></pre>
</div>
</div>
</body>
</html>