Title: [211342] trunk/Source
Revision
211342
Author
wenson_hs...@apple.com
Date
2017-01-28 15:13:17 -0800 (Sat, 28 Jan 2017)

Log Message

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:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (211341 => 211342)


--- 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)
@@ -1,3 +1,15 @@
+2017-01-28  Wenson Hsieh  <wenson_hs...@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  <sbar...@apple.com>
 
         Harden how the compiler references GC objects

Modified: trunk/Source/WTF/wtf/Platform.h (211341 => 211342)


--- 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)
@@ -669,7 +669,7 @@
 /* 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
 

Modified: trunk/Source/WebCore/ChangeLog (211341 => 211342)


--- 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)
@@ -1,3 +1,18 @@
+2017-01-28  Wenson Hsieh  <wenson_hs...@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  <y...@yoav.ws>
 
         Add Link Preload as an off-by-default experimental feature menu item.

Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (211341 => 211342)


--- 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)
@@ -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
 

Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (211341 => 211342)


--- 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)
@@ -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>
 

Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (211341 => 211342)


--- 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)
@@ -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
 

Modified: trunk/Source/WebCore/platform/mac/DragDataMac.mm (211341 => 211342)


--- 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)
@@ -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>
 

Modified: trunk/Source/WebKit2/ChangeLog (211341 => 211342)


--- 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)
@@ -1,3 +1,18 @@
+2017-01-28  Wenson Hsieh  <wenson_hs...@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  <y...@yoav.ws>
 
         Add Link Preload as an off-by-default experimental feature menu item.

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (211341 => 211342)


--- 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)
@@ -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
 

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (211341 => 211342)


--- 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)
@@ -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
 

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (211341 => 211342)


--- 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)
@@ -499,7 +499,7 @@
 
 @implementation WKContentView (WKInteraction)
 
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKContentViewInteractionAdditions.mm>)
+#if USE(APPLE_INTERNAL_SDK)
 #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
 #endif
 

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (211341 => 211342)


--- 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)
@@ -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
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to