<!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>[207136] 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/207136">207136</a></dd>
<dt>Author</dt> <dd>pvollan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 07:09:51 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Compile fix.
https://bugs.webkit.org/show_bug.cgi?id=163272
Reviewed by Brent Fulgham.
When compiling with older SDKs, some CoreText symbols are redefined.
This patch checks if the relevant CoreText header file has been
included before defining the symbol.
* platform/spi/win/CoreTextSPIWin.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspiwinCoreTextSPIWinh">trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207135 => 207136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-11 14:06:29 UTC (rev 207135)
+++ trunk/Source/WebCore/ChangeLog 2016-10-11 14:09:51 UTC (rev 207136)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-11 Per Arne Vollan <pvollan@apple.com>
+
+ [Win] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=163272
+
+ Reviewed by Brent Fulgham.
+
+ When compiling with older SDKs, some CoreText symbols are redefined.
+ This patch checks if the relevant CoreText header file has been
+ included before defining the symbol.
+
+ * platform/spi/win/CoreTextSPIWin.h:
+
</ins><span class="cx"> 2016-10-11 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Buttons container
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiwinCoreTextSPIWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h (207135 => 207136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h 2016-10-11 14:06:29 UTC (rev 207135)
+++ trunk/Source/WebCore/platform/spi/win/CoreTextSPIWin.h 2016-10-11 14:09:51 UTC (rev 207136)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #include <CoreGraphics/CoreGraphics.h>
</span><del>-#include <CoreText/CTDefines.h>
-#include <CoreText/CTFontDescriptor.h>
</del><ins>+#include <CoreText/CoreText.h>
</ins><span class="cx">
</span><span class="cx"> WTF_EXTERN_C_BEGIN
</span><span class="cx">
</span><span class="lines">@@ -40,11 +39,14 @@
</span><span class="cx"> CT_EXPORT const CFStringRef kCTFontAttributeName;
</span><span class="cx"> CT_EXPORT const CFStringRef kCTForegroundColorFromContextAttributeName;
</span><span class="cx">
</span><ins>+// This enum is defined in CTFont.h. To avoid redefinition, only define it here if CTFont.h has not been included.
+#ifndef __CTFONT__
</ins><span class="cx"> typedef CF_OPTIONS(uint32_t, CTFontTableOptions)
</span><span class="cx"> {
</span><span class="cx"> kCTFontTableOptionNoOptions = 0,
</span><span class="cx"> kCTFontTableOptionExcludeSynthetic = (1 << 0)
</span><span class="cx"> };
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> CTFontRef CTFontCreateWithName(CFStringRef, CGFloat size, const CGAffineTransform*);
</span><span class="cx"> CTFontRef CTFontCreateWithGraphicsFont(CGFontRef, CGFloat size, const CGAffineTransform*, CTFontDescriptorRef attributes);
</span></span></pre>
</div>
</div>
</body>
</html>