Clean up some drag and drop feature flags

https://bugs.webkit.org/show_bug.cgi?id=179082 Reviewed by Simon Fraser. Source/JavaScriptCore: * Configurations/FeatureDefines.xcconfig: Source/WebCore: * Configurations/FeatureDefines.xcconfig: Source/WebCore/PAL: * Configurations/FeatureDefines.xcconfig: Source/WebKit: * Configurations/FeatureDefines.xcconfig: Source/WebKitLegacy/mac: * Configurations/FeatureDefines.xcconfig: Tools: * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: * TestWebKitAPI/ios/UIKitSPI.h: Canonical link: https://commits.webkit.org/195214@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 31, 2017 · 6b3cf7dbc52714a2f467570d6a5c7b9725e1a075 · 6b3cf7d
1 parent 6079b53
commit 6b3cf7dbc52714a2f467570d6a5c7b9725e1a075
Showing 13 changed files with 76 additions and 5 deletions.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-10-31  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r224243, r224246, and r224248.

diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-10-31  Simon Fraser  <simon.fraser@apple.com>
 
         Make it possible to test rubber-banding in overflow scroll

diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-10-31  Tim Horton  <timothy_horton@apple.com>
 
         Fix up some content filtering feature flags

diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-10-31  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Followup to r224238: API::Attachment should generate a _WKAttachment ObjC wrapper

diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-10-31  Simon Fraser  <simon.fraser@apple.com>
 
         Make it possible to test rubber-banding in overflow scroll

diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2017-10-31  Tim Horton  <timothy_horton@apple.com>
+
+        Clean up some drag and drop feature flags
+        https://bugs.webkit.org/show_bug.cgi?id=179082
+
+        Reviewed by Simon Fraser.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
 2017-10-31  Tim Horton  <timothy_horton@apple.com>
 
         Fix up some content filtering feature flags

diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
 ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
 ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
+ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
+ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
 
 ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
 ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

diff --git a/Tools/TestWebKitAPI/ios/UIKitSPI.h b/Tools/TestWebKitAPI/ios/UIKitSPI.h
@@ -27,17 +27,19 @@
 
 #import <UIKit/UITextInputTraits.h>
 
-@protocol UIDragSession;
-@class UIDragInteraction;
-@class UIDragItem;
-
 #if USE(APPLE_INTERNAL_SDK)
 
 #import <UIKit/UIApplication_Private.h>
-#import <UIKit/UIDragInteraction_Private.h>
 #import <UIKit/UITextInputTraits_Private.h>
 #import <UIKit/UITextInput_Private.h>
 
+#if ENABLE(DRAG_SUPPORT)
+@protocol UIDragSession;
+@class UIDragInteraction;
+@class UIDragItem;
+#import <UIKit/UIDragInteraction_Private.h>
+#endif
+
 #else
 
 WTF_EXTERN_C_BEGIN
@@ -69,9 +71,11 @@ WTF_EXTERN_C_END
 - (NSDictionary *)_autofillContext;
 @end
 
+#if ENABLE(DRAG_SUPPORT)
 @protocol UIDragInteractionDelegate_Proposed_SPI_33146803 <UIDragInteractionDelegate>
 - (void)_dragInteraction:(UIDragInteraction *)interaction itemsForAddingToSession:(id <UIDragSession>)session withTouchAtPoint:(CGPoint)point completion:(void(^)(NSArray<UIDragItem *> *))completion;
 @end
+#endif
 
 #if __has_include(<UIKit/UITextAutofillSuggestion.h>)
 // FIXME: Move this import under USE(APPLE_INTERNAL_SDK) once <rdar://problem/34583628> lands in the SDK.