Skip to content

Commit d5b7e7c

Browse files
author
[email protected]
committed
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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@224263 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent bc925be commit d5b7e7c

File tree

13 files changed

+76
-5
lines changed

13 files changed

+76
-5
lines changed

‎Source/JavaScriptCore/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* Configurations/FeatureDefines.xcconfig:
9+
110
2017-10-31 Commit Queue <[email protected]>
211

312
Unreviewed, rolling out r224243, r224246, and r224248.

‎Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Source/WebCore/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* Configurations/FeatureDefines.xcconfig:
9+
110
2017-10-31 Simon Fraser <[email protected]>
211

312
Make it possible to test rubber-banding in overflow scroll

‎Source/WebCore/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Source/WebCore/PAL/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* Configurations/FeatureDefines.xcconfig:
9+
110
2017-10-31 Tim Horton <[email protected]>
211

312
Fix up some content filtering feature flags

‎Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Source/WebKit/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* Configurations/FeatureDefines.xcconfig:
9+
110
2017-10-31 Wenson Hsieh <[email protected]>
211

312
Followup to r224238: API::Attachment should generate a _WKAttachment ObjC wrapper

‎Source/WebKit/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Source/WebKitLegacy/mac/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* Configurations/FeatureDefines.xcconfig:
9+
110
2017-10-31 Simon Fraser <[email protected]>
211

312
Make it possible to test rubber-banding in overflow scroll

‎Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Tools/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2017-10-31 Tim Horton <[email protected]>
2+
3+
Clean up some drag and drop feature flags
4+
https://bugs.webkit.org/show_bug.cgi?id=179082
5+
6+
Reviewed by Simon Fraser.
7+
8+
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
9+
* TestWebKitAPI/ios/UIKitSPI.h:
10+
111
2017-10-31 Tim Horton <[email protected]>
212

313
Fix up some content filtering feature flags

‎Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
237237
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
238238
ENABLE_DRAG_SUPPORT[sdk=iphoneos10*] = ;
239239
ENABLE_DRAG_SUPPORT[sdk=iphonesimulator10*] = ;
240+
ENABLE_DRAG_SUPPORT[sdk=watch*] = ;
241+
ENABLE_DRAG_SUPPORT[sdk=appletv*] = ;
240242

241243
ENABLE_DATA_INTERACTION[sdk=iphone*] = $(ENABLE_DATA_INTERACTION_$(PLATFORM_NAME));
242244
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;

‎Tools/TestWebKitAPI/ios/UIKitSPI.h

+9-5
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727

2828
#import <UIKit/UITextInputTraits.h>
2929

30-
@protocol UIDragSession;
31-
@class UIDragInteraction;
32-
@class UIDragItem;
33-
3430
#if USE(APPLE_INTERNAL_SDK)
3531

3632
#import <UIKit/UIApplication_Private.h>
37-
#import <UIKit/UIDragInteraction_Private.h>
3833
#import <UIKit/UITextInputTraits_Private.h>
3934
#import <UIKit/UITextInput_Private.h>
4035

36+
#if ENABLE(DRAG_SUPPORT)
37+
@protocol UIDragSession;
38+
@class UIDragInteraction;
39+
@class UIDragItem;
40+
#import <UIKit/UIDragInteraction_Private.h>
41+
#endif
42+
4143
#else
4244

4345
WTF_EXTERN_C_BEGIN
@@ -69,9 +71,11 @@ WTF_EXTERN_C_END
6971
- (NSDictionary *)_autofillContext;
7072
@end
7173

74+
#if ENABLE(DRAG_SUPPORT)
7275
@protocol UIDragInteractionDelegate_Proposed_SPI_33146803 <UIDragInteractionDelegate>
7376
- (void)_dragInteraction:(UIDragInteraction *)interaction itemsForAddingToSession:(id <UIDragSession>)session withTouchAtPoint:(CGPoint)point completion:(void(^)(NSArray<UIDragItem *> *))completion;
7477
@end
78+
#endif
7579

7680
#if __has_include(<UIKit/UITextAutofillSuggestion.h>)
7781
// FIXME: Move this import under USE(APPLE_INTERNAL_SDK) once <rdar://problem/34583628> lands in the SDK.

0 commit comments

Comments
 (0)