<!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>[211342] trunk/Source</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/211342">211342</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-01-28 15:13:17 -0800 (Sat, 28 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
https://bugs.webkit.org/show_bug.cgi?id=167555
Reviewed by Dan Bernstein.
Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
USE(APPLE_INTERNAL_SDK) instead.
Source/WebCore:
* page/ios/EventHandlerIOS.mm:
* platform/ios/DragImageIOS.mm:
* platform/ios/PasteboardIOS.mm:
* platform/mac/DragDataMac.mm:
Source/WebKit2:
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosEventHandlerIOSmm">trunk/Source/WebCore/page/ios/EventHandlerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDragImageIOSmm">trunk/Source/WebCore/platform/ios/DragImageIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragDataMacmm">trunk/Source/WebCore/platform/mac/DragDataMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WTF/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-28 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=167555
+
+ Reviewed by Dan Bernstein.
+
+ Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
+ USE(APPLE_INTERNAL_SDK) instead.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2017-01-26 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Harden how the compiler references GC objects
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WTF/wtf/Platform.h 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> /* Include feature macros */
</span><span class="cx"> #include <wtf/FeatureDefines.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/AdditionalFeatureDefines.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebCore/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-28 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=167555
+
+ Reviewed by Dan Bernstein.
+
+ Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
+ USE(APPLE_INTERNAL_SDK) instead.
+
+ * page/ios/EventHandlerIOS.mm:
+ * platform/ios/DragImageIOS.mm:
+ * platform/ios/PasteboardIOS.mm:
+ * platform/mac/DragDataMac.mm:
+
</ins><span class="cx"> 2017-01-28 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Add Link Preload as an off-by-default experimental feature menu item.
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosEventHandlerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #import <WebKitAdditions/EventHandlerIOSTouch.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/EventHandlerAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/EventHandlerAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDragImageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #import <CoreGraphics/CoreGraphics.h>
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragImageAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx">
</span><span class="cx"> #import <WebKitAdditions/DragImageAdditions.mm>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> - (BOOL)containsAttachments;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PasteboardAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/PasteboardAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragDataMac.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import "PlatformStrategies.h"
</span><span class="cx"> #import "WebCoreNSURLExtras.h"
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragDataAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx">
</span><span class="cx"> #import <WebKitAdditions/DragDataAdditions.mm>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-28 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=167555
+
+ Reviewed by Dan Bernstein.
+
+ Instead of guarding #import <WebKitAdditions/*> on the existence of the imported file, consult
+ USE(APPLE_INTERNAL_SDK) instead.
+
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+
</ins><span class="cx"> 2017-01-28 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Add Link Preload as an off-by-default experimental feature menu item.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import <WebCore/ValidationBubble.h>
</span><span class="cx"> #import <wtf/cf/TypeCastsCF.h>
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebPageProxyAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WKContentViewInteractionAdditions.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WKContentView (WKInteraction)
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211341 => 211342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-01-28 22:53:54 UTC (rev 211341)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2017-01-28 23:13:17 UTC (rev 211342)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebDragClientAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>