<!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>[187573] 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/187573">187573</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-07-29 19:54:45 -0700 (Wed, 29 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix iOS build
Unreviewed.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::FontCascade): Deleted.
* platform/graphics/FontCascade.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187572 => 187573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/ChangeLog 2015-07-30 02:54:45 UTC (rev 187573)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-29 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Fix iOS build
+
+ Unreviewed.
+
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade): Deleted.
+ * platform/graphics/FontCascade.h:
+
</ins><span class="cx"> 2015-07-29 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL][CoordinatedGraphics] fixed position banner is moved when enabling delegateScrolling
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (187572 => 187573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-07-30 02:54:45 UTC (rev 187573)
</span><span class="lines">@@ -134,23 +134,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: We should make this constructor platform-independent.
-#if PLATFORM(IOS)
-FontCascade::FontCascade(const FontPlatformData& fontData, RefPtr<FontSelector>&& fontSelector)
- : m_weakPtrFactory(this)
- , m_letterSpacing(0)
- , m_wordSpacing(0)
- , m_typesettingFeatures(computeTypesettingFeatures())
-{
- CTFontRef primaryFont = fontData.font();
- m_fontDescription.setSpecifiedSize(CTFontGetSize(primaryFont));
- m_fontDescription.setComputedSize(CTFontGetSize(primaryFont));
- m_fontDescription.setIsItalic(CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitItalic);
- m_fontDescription.setWeight((CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitBold) ? FontWeightBold : FontWeightNormal);
- m_fonts = retrieveOrAddCachedFonts(m_fontDescription, WTF::move(fontSelector));
-}
-#endif
-
</del><span class="cx"> FontCascade::FontCascade(const FontCascade& other)
</span><span class="cx"> : m_fontDescription(other.m_fontDescription)
</span><span class="cx"> , m_fonts(other.m_fonts)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (187572 => 187573)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-30 02:34:07 UTC (rev 187572)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-07-30 02:54:45 UTC (rev 187573)
</span><span class="lines">@@ -119,11 +119,6 @@
</span><span class="cx"> // This constructor is only used if the platform wants to start with a native font.
</span><span class="cx"> WEBCORE_EXPORT FontCascade(const FontPlatformData&, FontSmoothingMode = AutoSmoothing);
</span><span class="cx">
</span><del>- // FIXME: We should make this constructor platform-independent.
-#if PLATFORM(IOS)
- FontCascade(const FontPlatformData&, PassRefPtr<FontSelector>);
-#endif
-
</del><span class="cx"> FontCascade(const FontCascade&);
</span><span class="cx"> WEBCORE_EXPORT FontCascade& operator=(const FontCascade&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>