<!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>[173221] trunk/Source/WebCore</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/173221">173221</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-09-03 13:26:52 -0700 (Wed, 03 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/173217">r173217</a>
* platform/graphics/ios/FontServicesIOS.h:
(WebCore::FontServicesIOS::capHeight):
* platform/graphics/ios/FontServicesIOS.mm:
(WebCore::FontServicesIOS::FontServicesIOS):
This fixes the build, but I don't know if it's completely correct.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontServicesIOSh">trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontServicesIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173220 => 173221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 20:18:36 UTC (rev 173220)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 20:26:52 UTC (rev 173221)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-03 Tim Horton <timothy_horton@apple.com>
+
+ iOS build fix after r173217
+
+ * platform/graphics/ios/FontServicesIOS.h:
+ (WebCore::FontServicesIOS::capHeight):
+ * platform/graphics/ios/FontServicesIOS.mm:
+ (WebCore::FontServicesIOS::FontServicesIOS):
+ This fixes the build, but I don't know if it's completely correct.
+
</ins><span class="cx"> 2014-09-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of DOMImplementationFront
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontServicesIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.h (173220 => 173221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.h 2014-09-03 20:18:36 UTC (rev 173220)
+++ trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.h 2014-09-03 20:26:52 UTC (rev 173221)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> CGFloat lineGap() { return m_lineGap; }
</span><span class="cx"> CGFloat lineSpacing() { return m_lineSpacing; }
</span><span class="cx"> CGFloat xHeight() { return m_xHeight; }
</span><ins>+ CGFloat capHeight() { return m_capHeight; }
</ins><span class="cx"> unsigned unitsPerEm() { return m_unitsPerEm; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -44,6 +45,7 @@
</span><span class="cx"> CGFloat m_lineGap;
</span><span class="cx"> CGFloat m_lineSpacing;
</span><span class="cx"> CGFloat m_xHeight;
</span><ins>+ CGFloat m_capHeight;
</ins><span class="cx"> unsigned m_unitsPerEm;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontServicesIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm (173220 => 173221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm 2014-09-03 20:18:36 UTC (rev 173220)
+++ trunk/Source/WebCore/platform/graphics/ios/FontServicesIOS.mm 2014-09-03 20:26:52 UTC (rev 173221)
</span><span class="lines">@@ -68,18 +68,22 @@
</span><span class="cx"> CGFloat lineGap;
</span><span class="cx"> CGFloat ascent;
</span><span class="cx"> CGFloat descent;
</span><ins>+ CGFloat capHeight;
</ins><span class="cx"> static bool isiOS7OrLater = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_7_0;
</span><span class="cx"> if (isiOS7OrLater) {
</span><span class="cx"> // Use CoreText API in iOS 7.
</span><span class="cx"> ascent = CTFontGetAscent(font);
</span><span class="cx"> descent = CTFontGetDescent(font);
</span><span class="cx"> lineGap = CTFontGetLeading(font);
</span><ins>+ capHeight = CTFontGetCapHeight(font);
</ins><span class="cx"> } else {
</span><span class="cx"> float pointSize = CTFontGetSize(font);
</span><span class="cx"> const CGFontHMetrics *metrics = CGFontGetHMetrics(cgFont.get());
</span><span class="cx"> unsigned unitsPerEm = CGFontGetUnitsPerEm(cgFont.get());
</span><ins>+ unsigned capHeightInGlyphSpace = CGFontGetCapHeight(cgFont.get());
</ins><span class="cx">
</span><span class="cx"> lineGap = (dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_3_0) ? scaleEmToUnits(metrics->lineGap, unitsPerEm) * pointSize : 0.0;
</span><ins>+ capHeight = scaleEmToUnits(capHeightInGlyphSpace, unitsPerEm) * pointSize;
</ins><span class="cx">
</span><span class="cx"> bool isiOS6OrLater = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_6_0;
</span><span class="cx"> if (!isiOS6OrLater || !isCourier(font)) {
</span><span class="lines">@@ -98,6 +102,7 @@
</span><span class="cx"> m_descent = descent;
</span><span class="cx"> m_lineGap = ceilf(lineGap);
</span><span class="cx"> m_lineSpacing = ceil(ascent) + adjustment + ceil(descent) + m_lineGap;
</span><ins>+ m_capHeight = capHeight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>