Diff
Modified: trunk/Source/WebCore/ChangeLog (195936 => 195937)
--- 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)
@@ -1,3 +1,23 @@
+2016-01-31 Dan Bernstein <[email protected]>
+
+ [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:
+
2016-01-31 Darin Adler <[email protected]>
Replace CaseFoldingHash with ASCIICaseInsensitiveHash
Modified: trunk/Source/WebCore/dom/EventNames.h (195936 => 195937)
--- 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)
@@ -27,7 +27,7 @@
#include <functional>
#include <wtf/text/AtomicString.h>
-#if defined(__has_include) && __has_include(<WebKitAdditions/EventNamesAdditions.h>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/EventNamesAdditions.h>
#endif
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (195936 => 195937)
--- 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)
@@ -44,7 +44,7 @@
#include "StorageNamespaceProvider.h"
#include <wtf/NeverDestroyed.h>
-#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/EmptyClientsIncludes.h>
#endif
@@ -138,7 +138,7 @@
pageConfiguration.storageNamespaceProvider = adoptRef(new EmptyStorageNamespaceProvider);
pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
-#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsFill.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/EmptyClientsFill.cpp>
#endif
}
Modified: trunk/Source/WebCore/page/MainFrame.cpp (195936 => 195937)
--- 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)
@@ -39,7 +39,7 @@
#include "ServicesOverlayController.h"
#endif /* PLATFORM(MAC) */
-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/MainFrameIncludes.h>
#endif
@@ -57,7 +57,7 @@
, m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
, m_diagnosticLoggingClient(configuration.diagnosticLoggingClient)
{
-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameInitialization.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/MainFrameInitialization.cpp>
#endif
}
Modified: trunk/Source/WebCore/page/MainFrame.h (195936 => 195937)
--- 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)
@@ -29,7 +29,7 @@
#include "Frame.h"
#include <wtf/Vector.h>
-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/MainFrameIncludes.h>
#endif
@@ -68,7 +68,7 @@
WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
-#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameMembers.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/MainFrameMembers.h>
#endif
Modified: trunk/Source/WebCore/page/PageConfiguration.h (195936 => 195937)
--- 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)
@@ -29,7 +29,7 @@
#include <wtf/Noncopyable.h>
#include <wtf/RefPtr.h>
-#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/PageConfigurationIncludes.h>
#endif
@@ -77,7 +77,7 @@
FrameLoaderClient* loaderClientForMainFrame { nullptr };
DiagnosticLoggingClient* diagnosticLoggingClient { nullptr };
-#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationMembers.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/PageConfigurationMembers.h>
#endif
Modified: trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (195936 => 195937)
--- 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)
@@ -25,7 +25,7 @@
#include "config.h"
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreAdditions.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebCoreAdditions.cpp>
#endif
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (195936 => 195937)
--- 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)
@@ -65,7 +65,7 @@
@end
#endif
-#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
#else
namespace WebCore {
Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (195936 => 195937)
--- 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)
@@ -39,7 +39,7 @@
#include <functional>
#include <wtf/NeverDestroyed.h>
-#if __has_include(<WebKitAdditions/LayerBackingStoreAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/LayerBackingStoreAdditions.mm>
#else
namespace WebCore {
Modified: trunk/Source/WebKit/mac/ChangeLog (195936 => 195937)
--- 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)
@@ -1,3 +1,17 @@
+2016-01-31 Dan Bernstein <[email protected]>
+
+ [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:]):
+
2016-01-29 Ada Chan <[email protected]>
Enable VIDEO_PRESENTATION_MODE only in Debug and Release builds on Mac
Modified: trunk/Source/WebKit/mac/WebKitAdditions.mm (195936 => 195937)
--- 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)
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef __has_include
-#if __has_include(<WebKitAdditions/WebKitLegacyAdditions.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebKitLegacyAdditions.cpp>
#endif
-#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (195936 => 195937)
--- 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)
@@ -295,7 +295,7 @@
#import <WebCore/WebMediaSessionManagerMac.h>
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebViewIncludes.h>
#endif
@@ -973,7 +973,7 @@
pageConfiguration.inspectorClient = new WebInspectorClient(self);
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebViewInitialization.mm>
#endif
@@ -1217,7 +1217,7 @@
pageConfiguration.dragClient = new WebDragClient(self);
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebViewInitialization.mm>
#endif
Modified: trunk/Source/WebKit2/ChangeLog (195936 => 195937)
--- 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)
@@ -1,3 +1,24 @@
+2016-01-31 Dan Bernstein <[email protected]>
+
+ [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):
+
2016-01-31 Timothy Horton <[email protected]>
Include the right WebKitAdditions files
Modified: trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm (195936 => 195937)
--- 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)
@@ -25,6 +25,6 @@
#import "config.h"
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebKitAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/WebKitAdditions.mm>
#endif
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (195936 => 195937)
--- 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)
@@ -465,7 +465,7 @@
} // namespace IPC
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreArgumentCodersAdditions.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
#endif
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (195936 => 195937)
--- 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)
@@ -44,7 +44,7 @@
#import <mach/mach_port.h>
#endif
-#if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
#else
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (195936 => 195937)
--- 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)
@@ -142,7 +142,7 @@
ResizingWithDocumentHidden,
};
-#if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
#else
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195936 => 195937)
--- 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)
@@ -165,7 +165,7 @@
#include <WebCore/MediaSessionMetadata.h>
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyIncludes.h>
#endif
@@ -474,7 +474,7 @@
m_vibration = WebVibrationProxy::create(this);
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyInitialization.cpp>
#endif
@@ -706,7 +706,7 @@
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyInitialization.cpp>
#endif
@@ -5045,7 +5045,7 @@
m_pageClient.mediaSessionManager().removeAllPlaybackTargetPickerClients(*this);
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInvalidation.cpp>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyInvalidation.cpp>
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (195936 => 195937)
--- 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)
@@ -122,7 +122,7 @@
#include <WebCore/WebMediaSessionManagerClient.h>
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyIncludes.h>
#endif
@@ -1557,7 +1557,7 @@
RefPtr<WebVibrationProxy> m_vibration;
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyMembers.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageProxyMembers.h>
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (195936 => 195937)
--- 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)
@@ -231,7 +231,7 @@
#include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
#endif
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageIncludes.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageIncludes.h>
#endif
@@ -398,7 +398,7 @@
pageConfiguration.userContentController = m_userContentController ? &m_userContentController->userContentController() : &m_pageGroup->userContentController();
pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
-#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageInitialization.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/WebPageInitialization.h>
#endif
