<!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>[167679] 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/167679">167679</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-04-22 13:38:00 -0700 (Tue, 22 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[OS X] Glyph spacing for system fonts may be incorrect
https://bugs.webkit.org/show_bug.cgi?id=131967
Reviewed by Simon Fraser.
Source/WebCore:
Covered by existing tests.
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::platformWidthForGlyph): Update to use CTFontGetAdvancesForGlyphs() for system fonts
(WebCore::hasCustomTracking):
LayoutTests:
Updating test to be more robust.
* fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt:
* fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastformssearchintrinsicsearchwidthwithdecorationborderpaddingexpectedtxt">trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformssearchintrinsicsearchwidthwithdecorationborderpaddinghtml">trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167678 => 167679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-22 20:31:47 UTC (rev 167678)
+++ trunk/LayoutTests/ChangeLog 2014-04-22 20:38:00 UTC (rev 167679)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-04-21 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Glyph spacing for system fonts may be incorrect
+ https://bugs.webkit.org/show_bug.cgi?id=131967
+
+ Reviewed by Simon Fraser.
+
+ Updating test to be more robust.
+
+ * fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt:
+ * fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html:
+
</ins><span class="cx"> 2014-04-22 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r167652): Broke fast/regions/cssom/region-range-for-box-crash.html in debug mode
</span></span></pre></div>
<a id="trunkLayoutTestsfastformssearchintrinsicsearchwidthwithdecorationborderpaddingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt (167678 => 167679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt 2014-04-22 20:31:47 UTC (rev 167678)
+++ trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding-expected.txt 2014-04-22 20:38:00 UTC (rev 167679)
</span><span class="lines">@@ -3,3 +3,4 @@
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><span class="cx">
</span><ins>+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastformssearchintrinsicsearchwidthwithdecorationborderpaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html (167678 => 167679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html 2014-04-22 20:31:47 UTC (rev 167678)
+++ trunk/LayoutTests/fast/forms/search/intrinsic-search-width-with-decoration-border-padding.html 2014-04-22 20:38:00 UTC (rev 167679)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><span class="cx">
</span><span class="cx"> <input type="search" id="search1">
</span><ins>+<br/>
</ins><span class="cx"> <input type="search" id="search2">
</span><span class="cx"> <script>
</span><span class="cx"> shouldBe('document.getElementById("search1").offsetWidth', 'document.getElementById("search2").offsetWidth');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167678 => 167679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-22 20:31:47 UTC (rev 167678)
+++ trunk/Source/WebCore/ChangeLog 2014-04-22 20:38:00 UTC (rev 167679)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-21 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [OS X] Glyph spacing for system fonts may be incorrect
+ https://bugs.webkit.org/show_bug.cgi?id=131967
+
+ Reviewed by Simon Fraser.
+
+ Covered by existing tests.
+
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::SimpleFontData::platformWidthForGlyph): Update to use CTFontGetAdvancesForGlyphs() for system fonts
+ (WebCore::hasCustomTracking):
+
</ins><span class="cx"> 2014-04-22 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] widows/orphans cause assertion failures.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (167678 => 167679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 20:31:47 UTC (rev 167678)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2014-04-22 20:38:00 UTC (rev 167679)
</span><span class="lines">@@ -47,6 +47,12 @@
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<CoreText/CTFontDescriptorPriv.h>)
+#import <CoreText/CTFontDescriptorPriv.h>
+#endif
+
+extern "C" bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> @interface NSFont (WebAppKitSecretAPI)
</span><span class="cx"> - (BOOL)_isFakeFixedPitch;
</span><span class="lines">@@ -359,11 +365,23 @@
</span><span class="cx"> return boundingBox;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool hasCustomTracking(CTFontRef font)
+{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+ UNUSED_PARAM(font);
+ return false;
+#else
+ RetainPtr<CTFontDescriptorRef> descriptor = CTFontCopyFontDescriptor(font);
+ return CTFontDescriptorIsSystemUIFont(descriptor.get())
+#endif
+}
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
</span><span class="cx"> {
</span><span class="cx"> CGSize advance = CGSizeZero;
</span><del>- if (platformData().orientation() == Horizontal || m_isBrokenIdeographFallback) {
</del><ins>+ bool horizontal = platformData().orientation() == Horizontal;
+ if ((horizontal || m_isBrokenIdeographFallback) && !hasCustomTracking(m_platformData.ctFont())) {
</ins><span class="cx"> NSFont *font = platformData().font();
</span><span class="cx"> if (font && platformData().isColorBitmapFont())
</span><span class="cx"> advance = NSSizeToCGSize([font advancementForGlyph:glyph]);
</span><span class="lines">@@ -376,7 +394,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), kCTFontVerticalOrientation, &glyph, &advance, 1);
</del><ins>+ CTFontGetAdvancesForGlyphs(m_platformData.ctFont(), horizontal ? kCTFontHorizontalOrientation : kCTFontVerticalOrientation, &glyph, &advance, 1);
</ins><span class="cx">
</span><span class="cx"> return advance.width + m_syntheticBoldOffset;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>