<!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>[192917] 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/192917">192917</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 14:43:52 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/192895">r192895</a>
Unreviewed.
* platform/graphics/FontPlatformData.h:
(WebCore::FontPlatformData::isSystemFont):
(WebCore::FontPlatformData::setIsSystemFont):
* platform/graphics/win/SimpleFontDataCGWin.cpp:
(WebCore::Font::platformInit):
(WebCore::Font::platformWidthForGlyph):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinSimpleFontDataCGWincpp">trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192916 => 192917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-01 22:33:04 UTC (rev 192916)
+++ trunk/Source/WebCore/ChangeLog 2015-12-01 22:43:52 UTC (rev 192917)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-01 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Win] Build fix after r192895
+
+ Unreviewed.
+
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::FontPlatformData::isSystemFont):
+ (WebCore::FontPlatformData::setIsSystemFont):
+ * platform/graphics/win/SimpleFontDataCGWin.cpp:
+ (WebCore::Font::platformInit):
+ (WebCore::Font::platformWidthForGlyph):
+
</ins><span class="cx"> 2015-12-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Update bindings test results after r192903.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (192916 => 192917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-01 22:33:04 UTC (rev 192916)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-12-01 22:43:52 UTC (rev 192917)
</span><span class="lines">@@ -115,7 +115,6 @@
</span><span class="cx"> static RetainPtr<CFTypeRef> objectForEqualityCheck(CTFontRef);
</span><span class="cx"> RetainPtr<CFTypeRef> objectForEqualityCheck() const;
</span><span class="cx">
</span><del>- bool isSystemFont() const { return m_isSystemFont; }
</del><span class="cx"> bool hasCustomTracking() const { return isSystemFont(); }
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="lines">@@ -125,6 +124,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN) || PLATFORM(COCOA)
+ bool isSystemFont() const { return m_isSystemFont; }
+ void setIsSystemFont(bool isSystemFont) { m_isSystemFont = isSystemFont; }
+#endif
+
</ins><span class="cx"> #if USE(CG)
</span><span class="cx"> CGFontRef cgFont() const { return m_cgFont.get(); }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinSimpleFontDataCGWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp (192916 => 192917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp 2015-12-01 22:33:04 UTC (rev 192916)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp 2015-12-01 22:43:52 UTC (rev 192917)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> m_syntheticBoldOffset = m_platformData.syntheticBold() ? 1.0f : 0.f;
</span><span class="cx"> m_scriptCache = 0;
</span><span class="cx"> m_scriptFontProperties = 0;
</span><del>- m_isSystemFont = false;
</del><span class="cx">
</span><span class="cx"> if (m_platformData.useGDI())
</span><span class="cx"> return initGDIFont();
</span><span class="lines">@@ -87,7 +86,7 @@
</span><span class="cx"> int faceLength = GetTextFace(dc, 0, 0);
</span><span class="cx"> Vector<WCHAR> faceName(faceLength);
</span><span class="cx"> GetTextFace(dc, faceLength, faceName.data());
</span><del>- m_isSystemFont = !wcscmp(faceName.data(), L"Lucida Grande");
</del><ins>+ m_platformData.setIsSystemFont(!wcscmp(faceName.data(), L"Lucida Grande"));
</ins><span class="cx"> SelectObject(dc, oldFont);
</span><span class="cx">
</span><span class="cx"> fAscent = ascentConsideringMacAscentHack(faceName.data(), fAscent, fDescent);
</span><span class="lines">@@ -148,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Need to add real support for printer fonts.
</span><span class="cx"> bool isPrinterFont = false;
</span><del>- wkGetGlyphAdvances(font, m, m_isSystemFont, isPrinterFont, glyph, advance);
</del><ins>+ wkGetGlyphAdvances(font, m, m_platformData.isSystemFont(), isPrinterFont, glyph, advance);
</ins><span class="cx">
</span><span class="cx"> return advance.width + m_syntheticBoldOffset;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>