<!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>[195937] 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/195937">195937</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-01-31 15:00:03 -0800 (Sun, 31 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Remove __has_include guards around use of WebKitAdditions
https://bugs.webkit.org/show_bug.cgi?id=153728
Reviewed by Andy Estes.
Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
Source/WebCore:
* dom/EventNames.h:
* loader/EmptyClients.cpp:
(WebCore::fillWithEmptyClients):
* page/MainFrame.cpp:
(WebCore::MainFrame::MainFrame):
* page/MainFrame.h:
* page/PageConfiguration.h:
* platform/cocoa/WebKitAdditions.mm:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
* platform/ios/LegacyTileGridTile.mm:
Source/WebKit/mac:
* WebKitAdditions.mm:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
Source/WebKit2:
* Shared/Cocoa/WebKitAdditions.mm:
* Shared/WebCoreArgumentCoders.h:
* Shared/mac/RemoteLayerBackingStore.mm:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::resetState):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_shouldDispatchFakeMouseMoveEvents):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFramecpp">trunk/Source/WebCore/page/MainFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFrameh">trunk/Source/WebCore/page/MainFrame.h</a></li>
<li><a href="#trunkSourceWebCorepagePageConfigurationh">trunk/Source/WebCore/page/PageConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaWebKitAdditionsmm">trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileGridTilemm">trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebKitAdditionsmm">trunk/Source/WebKit/mac/WebKitAdditions.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWebKitAdditionsmm">trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/ChangeLog 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-31 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Remove __has_include guards around use of WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=153728
+
+ Reviewed by Andy Estes.
+
+ Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
+
+ * dom/EventNames.h:
+ * loader/EmptyClients.cpp:
+ (WebCore::fillWithEmptyClients):
+ * page/MainFrame.cpp:
+ (WebCore::MainFrame::MainFrame):
+ * page/MainFrame.h:
+ * page/PageConfiguration.h:
+ * platform/cocoa/WebKitAdditions.mm:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ * platform/ios/LegacyTileGridTile.mm:
+
</ins><span class="cx"> 2016-01-31 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace CaseFoldingHash with ASCIICaseInsensitiveHash
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.h 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/dom/EventNames.h 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/EventNamesAdditions.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/EventNamesAdditions.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/EmptyClientsIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = adoptRef(new EmptyStorageNamespaceProvider);
</span><span class="cx"> pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsFill.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/EmptyClientsFill.cpp>
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.cpp (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MainFrame.cpp 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/page/MainFrame.cpp 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "ServicesOverlayController.h"
</span><span class="cx"> #endif /* PLATFORM(MAC) */
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/MainFrameIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> , m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
</span><span class="cx"> , m_diagnosticLoggingClient(configuration.diagnosticLoggingClient)
</span><span class="cx"> {
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameInitialization.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/MainFrameInitialization.cpp>
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.h (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MainFrame.h 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/page/MainFrame.h 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/MainFrameIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameMembers.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/MainFrameMembers.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConfiguration.h (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConfiguration.h 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/page/PageConfiguration.h 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/PageConfigurationIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> FrameLoaderClient* loaderClientForMainFrame { nullptr };
</span><span class="cx"> DiagnosticLoggingClient* diagnosticLoggingClient { nullptr };
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationMembers.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/PageConfigurationMembers.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreAdditions.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebCoreAdditions.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/LayerBackingStoreAdditions.mm>
</span><span class="cx"> #else
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileGridTilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/LayerBackingStoreAdditions.mm>
</span><span class="cx"> #else
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-31 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Remove __has_include guards around use of WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=153728
+
+ Reviewed by Andy Estes.
+
+ Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
+
+ * WebKitAdditions.mm:
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
</ins><span class="cx"> 2016-01-29 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable VIDEO_PRESENTATION_MODE only in Debug and Release builds on Mac
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitAdditionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebKitAdditions.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifdef __has_include
-#if __has_include(<WebKitAdditions/WebKitLegacyAdditions.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebKitLegacyAdditions.cpp>
</span><span class="cx"> #endif
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> #import <WebCore/WebMediaSessionManagerMac.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebViewIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebViewInitialization.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1217,7 +1217,7 @@
</span><span class="cx"> pageConfiguration.dragClient = new WebDragClient(self);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebViewInitialization.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-31 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Remove __has_include guards around use of WebKitAdditions
+ https://bugs.webkit.org/show_bug.cgi?id=153728
+
+ Reviewed by Andy Estes.
+
+ Guard WebKitAdditions includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
+
+ * Shared/Cocoa/WebKitAdditions.mm:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::resetState):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_shouldDispatchFakeMouseMoveEvents):
+
</ins><span class="cx"> 2016-01-31 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Include the right WebKitAdditions files
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWebKitAdditionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -25,6 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebKitAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/WebKitAdditions.mm>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreArgumentCodersAdditions.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #import <mach/mach_port.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> ResizingWithDocumentHidden,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #include <WebCore/MediaSessionMetadata.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> m_vibration = WebVibrationProxy::create(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyInitialization.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyInitialization.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -5045,7 +5045,7 @@
</span><span class="cx"> m_pageClient.mediaSessionManager().removeAllPlaybackTargetPickerClients(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInvalidation.cpp>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyInvalidation.cpp>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> #include <WebCore/WebMediaSessionManagerClient.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1557,7 +1557,7 @@
</span><span class="cx"> RefPtr<WebVibrationProxy> m_vibration;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyMembers.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageProxyMembers.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (195936 => 195937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-31 22:46:46 UTC (rev 195936)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-31 23:00:03 UTC (rev 195937)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> #include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageIncludes.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageIncludes.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> pageConfiguration.userContentController = m_userContentController ? &m_userContentController->userContentController() : &m_pageGroup->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageInitialization.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <WebKitAdditions/WebPageInitialization.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>