Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitA...
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Jan 2017 23:13:17 +0000 (23:13 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Jan 2017 23:13:17 +0000 (23:13 +0000)
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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@211342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/page/ios/EventHandlerIOS.mm
Source/WebCore/platform/ios/DragImageIOS.mm
Source/WebCore/platform/ios/PasteboardIOS.mm
Source/WebCore/platform/mac/DragDataMac.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm
Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm

index faf5437..1200adb 100644 (file)
@@ -1,3 +1,15 @@
+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:
+
 2017-01-26  Saam Barati  <sbarati@apple.com>
 
         Harden how the compiler references GC objects
index 2e6c164..11ba4b6 100644 (file)
 /* Include feature macros */
 #include <wtf/FeatureDefines.h>
 
-#if defined(__has_include) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <WebKitAdditions/AdditionalFeatureDefines.h>
 #endif
 
index c3046a1..7d9df38 100644 (file)
@@ -1,3 +1,18 @@
+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:
+
 2017-01-28  Yoav Weiss  <yoav@yoav.ws>
 
         Add Link Preload as an off-by-default experimental feature menu item.
index d3f75d9..b09f9e9 100644 (file)
@@ -49,7 +49,7 @@
 #import <WebKitAdditions/EventHandlerIOSTouch.cpp>
 #endif
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/EventHandlerAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/EventHandlerAdditions.mm>
 #endif
 
index 964ad6e..3682a07 100644 (file)
@@ -28,7 +28,7 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragImageAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 
 #import <WebKitAdditions/DragImageAdditions.mm>
 
index 2c053b1..3ab739d 100644 (file)
@@ -58,7 +58,7 @@
 - (BOOL)containsAttachments;
 @end
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PasteboardAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/PasteboardAdditions.mm>
 #endif
 
index 0ffed6c..ac3c5b0 100644 (file)
@@ -33,7 +33,7 @@
 #import "PlatformStrategies.h"
 #import "WebCoreNSURLExtras.h"
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/DragDataAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 
 #import <WebKitAdditions/DragDataAdditions.mm>
 
index 34ddbc9..f7d516f 100644 (file)
@@ -1,3 +1,18 @@
+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:
+
 2017-01-28  Yoav Weiss  <yoav@yoav.ws>
 
         Add Link Preload as an off-by-default experimental feature menu item.
index 5ff893b..f5a71a7 100644 (file)
@@ -34,7 +34,7 @@
 #import <WebCore/ValidationBubble.h>
 #import <wtf/cf/TypeCastsCF.h>
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPageProxyAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WebPageProxyAdditions.mm>
 #endif
 
index 8f5cbab..09e6209 100644 (file)
@@ -44,7 +44,7 @@
 #import <wtf/Vector.h>
 #import <wtf/text/WTFString.h>
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WKContentViewInteractionAdditions.h>
 #endif
 
index a0f8fb8..129d074 100644 (file)
@@ -499,7 +499,7 @@ const CGFloat minimumTapHighlightRadius = 2.0;
 
 @implementation WKContentView (WKInteraction)
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
 #endif
 
index 9a84528..bdea9a8 100644 (file)
@@ -51,7 +51,7 @@
 using namespace WebCore;
 using namespace WebKit;
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebDragClientAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WebDragClientAdditions.mm>
 #endif