<!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>[178394] trunk/Source/WebKit/ios</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/178394">178394</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 17:05:55 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed iOS build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/178375">r178375</a>
Match FontSelector API changes.
* Misc/EmojiFallbackFontSelector.cpp:
(EmojiFallbackFontSelector::fallbackFontDataAt):
(EmojiFallbackFontSelector::getFallbackFontData): Deleted.
* Misc/EmojiFallbackFontSelector.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscEmojiFallbackFontSelectorcpp">trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebKitiosMiscEmojiFallbackFontSelectorh">trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (178393 => 178394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2015-01-14 00:45:49 UTC (rev 178393)
+++ trunk/Source/WebKit/ios/ChangeLog 2015-01-14 01:05:55 UTC (rev 178394)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-13 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed iOS build fix after r178375
+
+ Match FontSelector API changes.
+
+ * Misc/EmojiFallbackFontSelector.cpp:
+ (EmojiFallbackFontSelector::fallbackFontDataAt):
+ (EmojiFallbackFontSelector::getFallbackFontData): Deleted.
+ * Misc/EmojiFallbackFontSelector.h:
+
</ins><span class="cx"> 2014-12-07 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce and deploy a function that allocates and returns an instance of a soft-linked class
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscEmojiFallbackFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp (178393 => 178394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp 2015-01-14 00:45:49 UTC (rev 178393)
+++ trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.cpp 2015-01-14 01:05:55 UTC (rev 178394)
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-PassRefPtr<FontData> EmojiFallbackFontSelector::getFallbackFontData(const FontDescription& fontDescription, size_t)
</del><ins>+PassRefPtr<SimpleFontData> EmojiFallbackFontSelector::fallbackFontDataAt(const FontDescription& fontDescription, size_t)
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, appleColorEmoji, ("Apple Color Emoji"));
</span><del>- RefPtr<FontData> fontData = fontCache().fontForFamily(fontDescription, appleColorEmoji);
</del><ins>+ RefPtr<SimpleFontData> fontData = fontCache().fontForFamily(fontDescription, appleColorEmoji);
</ins><span class="cx"> if (!fontData) {
</span><span class="cx"> LOG_ERROR("Failed to get \"Apple Color Emoji\" from the font cache. Using the last resort fallback font instead.");
</span><span class="cx"> fontData = fontCache().lastResortFallbackFont(fontDescription);
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscEmojiFallbackFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.h (178393 => 178394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.h 2015-01-14 00:45:49 UTC (rev 178393)
+++ trunk/Source/WebKit/ios/Misc/EmojiFallbackFontSelector.h 2015-01-14 01:05:55 UTC (rev 178394)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<EmojiFallbackFontSelector> create() { return adoptRef(new EmojiFallbackFontSelector()); }
</span><span class="cx"> virtual ~EmojiFallbackFontSelector() override { }
</span><del>- virtual PassRefPtr<WebCore::FontData> getFontData(const WebCore::FontDescription&, const AtomicString& familyName) override { ASSERT_NOT_REACHED(); return 0; }
</del><ins>+ virtual WebCore::FontRanges fontRangesForFamily(const WebCore::FontDescription&, const AtomicString&) override { ASSERT_NOT_REACHED(); return WebCore::FontRanges(); }
</ins><span class="cx"> virtual bool resolvesFamilyFor(const WebCore::FontDescription&) const override { ASSERT_NOT_REACHED(); return false; }
</span><span class="cx"> virtual size_t fallbackFontDataCount() override { return 1; };
</span><del>- virtual PassRefPtr<WebCore::FontData> getFallbackFontData(const WebCore::FontDescription&, size_t) override;
</del><ins>+ virtual PassRefPtr<WebCore::SimpleFontData> fallbackFontDataAt(const WebCore::FontDescription&, size_t) override;
</ins><span class="cx">
</span><span class="cx"> virtual void registerForInvalidationCallbacks(WebCore::FontSelectorClient*) override { }
</span><span class="cx"> virtual void unregisterForInvalidationCallbacks(WebCore::FontSelectorClient*) override { }
</span></span></pre>
</div>
</div>
</body>
</html>