<!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>[207774] 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/207774">207774</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 13:42:48 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build with newer versions of clang
https://bugs.webkit.org/show_bug.cgi?id=163908
rdar://problem/28852016
Reviewed by Tim Horton.
Use the macros that names the soft-linked functions in such a way that they won't conflict with actual functions.
* platform/ios/PlatformScreenIOS.mm:
(WebCore::screenIsMonochrome):
(WebCore::screenHasInvertedColors):
(WebCore::screenSize):
(WebCore::availableScreenSize):
(WebCore::screenScaleFactor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformScreenIOSmm">trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207773 => 207774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-24 20:25:02 UTC (rev 207773)
+++ trunk/Source/WebCore/ChangeLog 2016-10-24 20:42:48 UTC (rev 207774)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-24 Anders Carlsson <andersca@apple.com>
+
+ Fix build with newer versions of clang
+ https://bugs.webkit.org/show_bug.cgi?id=163908
+ rdar://problem/28852016
+
+ Reviewed by Tim Horton.
+
+ Use the macros that names the soft-linked functions in such a way that they won't conflict with actual functions.
+
+ * platform/ios/PlatformScreenIOS.mm:
+ (WebCore::screenIsMonochrome):
+ (WebCore::screenHasInvertedColors):
+ (WebCore::screenSize):
+ (WebCore::availableScreenSize):
+ (WebCore::screenScaleFactor):
+
</ins><span class="cx"> 2016-10-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary unused variable stubs
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformScreenIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (207773 => 207774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2016-10-24 20:25:02 UTC (rev 207773)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2016-10-24 20:42:48 UTC (rev 207774)
</span><span class="lines">@@ -39,11 +39,11 @@
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "Widget.h"
</span><span class="cx">
</span><del>-SOFT_LINK_FRAMEWORK(UIKit)
-SOFT_LINK_CLASS(UIKit, UIApplication)
-SOFT_LINK_CLASS(UIKit, UIScreen)
-SOFT_LINK(UIKit, UIAccessibilityIsGrayscaleEnabled, BOOL, (void), ())
-SOFT_LINK(UIKit, UIAccessibilityIsInvertColorsEnabled, BOOL, (void), ())
</del><ins>+SOFT_LINK_FRAMEWORK_FOR_SOURCE(WebCore, UIKit)
+SOFT_LINK_CLASS_FOR_SOURCE(WebCore, UIKit, UIApplication)
+SOFT_LINK_CLASS_FOR_SOURCE(WebCore, UIKit, UIScreen)
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, UIKit, UIAccessibilityIsGrayscaleEnabled, BOOL, (void), ())
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, UIKit, UIAccessibilityIsInvertColorsEnabled, BOOL, (void), ())
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx">
</span><span class="cx"> bool screenIsMonochrome(Widget*)
</span><span class="cx"> {
</span><del>- return UIAccessibilityIsGrayscaleEnabled();
</del><ins>+ return softLinkUIKitUIAccessibilityIsGrayscaleEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool screenHasInvertedColors()
</span><span class="cx"> {
</span><del>- return UIAccessibilityIsInvertColorsEnabled();
</del><ins>+ return softLinkUIKitUIAccessibilityIsInvertColorsEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool screenSupportsExtendedColor(Widget*)
</span><span class="lines">@@ -131,28 +131,28 @@
</span><span class="cx">
</span><span class="cx"> FloatSize screenSize()
</span><span class="cx"> {
</span><del>- if (deviceHasIPadCapability() && [[getUIApplicationClass() sharedApplication] _isClassic])
</del><ins>+ if (deviceHasIPadCapability() && [[get_UIKit_UIApplicationClass() sharedApplication] _isClassic])
</ins><span class="cx"> return { 320, 480 };
</span><del>- return FloatSize([[getUIScreenClass() mainScreen] _referenceBounds].size);
</del><ins>+ return FloatSize([[get_UIKit_UIScreenClass() mainScreen] _referenceBounds].size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize availableScreenSize()
</span><span class="cx"> {
</span><del>- if (deviceHasIPadCapability() && [[getUIApplicationClass() sharedApplication] _isClassic])
</del><ins>+ if (deviceHasIPadCapability() && [[get_UIKit_UIApplicationClass() sharedApplication] _isClassic])
</ins><span class="cx"> return { 320, 480 };
</span><del>- return FloatSize([getUIScreenClass() mainScreen].bounds.size);
</del><ins>+ return FloatSize([get_UIKit_UIScreenClass() mainScreen].bounds.size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float screenScaleFactor(UIScreen *screen)
</span><span class="cx"> {
</span><span class="cx"> if (!screen)
</span><del>- screen = [getUIScreenClass() mainScreen];
</del><ins>+ screen = [get_UIKit_UIScreenClass() mainScreen];
</ins><span class="cx">
</span><span class="cx"> CGFloat scale = screen.scale;
</span><span class="cx">
</span><span class="cx"> // We can remove this clamping once <rdar://problem/16395475> is fixed.
</span><span class="cx"> const CGFloat maximumClassicScreenScaleFactor = 2;
</span><del>- if ([[getUIApplicationClass() sharedApplication] _isClassic])
</del><ins>+ if ([[get_UIKit_UIApplicationClass() sharedApplication] _isClassic])
</ins><span class="cx"> return std::min(scale, maximumClassicScreenScaleFactor);
</span><span class="cx">
</span><span class="cx"> return scale;
</span></span></pre>
</div>
</div>
</body>
</html>