Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (229942 => 229943)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,3 +1,12 @@
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-23 Mark Lam <mark....@apple.com>
LLInt TypeArray pointer poisoning should not pick its poison dynamically.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
Modified: trunk/Source/WebCore/ChangeLog (229942 => 229943)
--- trunk/Source/WebCore/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebCore/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,3 +1,13 @@
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/PlatformPasteboardIOS.mm:
+
2018-03-23 Wenson Hsieh <wenson_hs...@apple.com>
[Extra zoom mode] Fix some localizable strings after r229878
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
Modified: trunk/Source/WebCore/PAL/ChangeLog (229942 => 229943)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,3 +1,12 @@
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-22 Tim Horton <timothy_hor...@apple.com>
Adopt WK_ALTERNATE_FRAMEWORKS_DIR in WebCore
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (229942 => 229943)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2018-03-24 05:56:49 UTC (rev 229943)
@@ -45,7 +45,7 @@
#import <wtf/SoftLinking.h>
#import <wtf/text/StringHash.h>
-#define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV)))
+#define PASTEBOARD_SUPPORTS_ITEM_PROVIDERS (PLATFORM(IOS) && !(PLATFORM(WATCHOS) || PLATFORM(APPLETV) || ENABLE(MINIMAL_SIMULATOR)))
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK_CLASS(UIKit, UIImage)
Modified: trunk/Source/WebKit/ChangeLog (229942 => 229943)
--- trunk/Source/WebKit/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKit/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,3 +1,12 @@
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-23 Megan Gardner <megan_gard...@apple.com>
Enable unified text selection in select cases for gradual testing
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (229942 => 229943)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,5 +1,30 @@
2018-03-23 Tim Horton <timothy_hor...@apple.com>
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebView/WebView.mm:
+ (-[WebView _requestStartDataInteraction:globalPosition:]):
+ (-[WebView _getDataInteractionData]):
+ (-[WebView _dataOperationTextIndicator]):
+ (-[WebView _dragSourceAction]):
+ (-[WebView _draggedLinkTitle]):
+ (-[WebView _draggedLinkURL]):
+ (-[WebView _draggedElementBounds]):
+ (-[WebView _enteredDataInteraction:client:global:operation:]):
+ (-[WebView _updatedDataInteraction:client:global:operation:]):
+ (-[WebView _exitedDataInteraction:client:global:operation:]):
+ (-[WebView _performDataInteraction:client:global:operation:]):
+ (-[WebView _tryToPerformDataInteraction:client:global:operation:]):
+ (-[WebView _endedDataInteraction:global:]):
+ (-[WebView _dataInteractionCaretRect]):
+ * WebView/WebViewPrivate.h:
+
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
Adopt WK_ALTERNATE_FRAMEWORKS_DIR in WebKitLegacy and update install name
https://bugs.webkit.org/show_bug.cgi?id=183960
<rdar://problem/38812356>
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (229942 => 229943)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1806,8 +1806,10 @@
}
#endif
-#if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS)
+#if PLATFORM(IOS)
+#if ENABLE(DRAG_SUPPORT)
+
- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
{
WebThreadLock();
@@ -1938,8 +1940,78 @@
}
}
-#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(IOS)
+#else
+- (BOOL)_requestStartDataInteraction:(CGPoint)clientPosition globalPosition:(CGPoint)globalPosition
+{
+ return NO;
+}
+
+- (WebUITextIndicatorData *)_getDataInteractionData
+{
+ return nil;
+}
+
+- (WebUITextIndicatorData *)_dataOperationTextIndicator
+{
+ return nil;
+}
+
+- (NSUInteger)_dragSourceAction
+{
+ return 0;
+}
+
+- (NSString *)_draggedLinkTitle
+{
+ return nil;
+}
+
+- (NSURL *)_draggedLinkURL
+{
+ return nil;
+}
+
+- (CGRect)_draggedElementBounds
+{
+ return CGRectNull;
+}
+
+- (uint64_t)_enteredDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+ return 0;
+}
+
+- (uint64_t)_updatedDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+ return 0;
+}
+
+- (void)_exitedDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+}
+
+- (void)_performDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+}
+
+- (BOOL)_tryToPerformDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation
+{
+ return NO;
+}
+
+- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)globalPosition
+{
+}
+
+- (CGRect)_dataInteractionCaretRect
+{
+ return CGRectNull;
+}
+
+#endif
+#endif // PLATFORM(IOS)
+
static NSMutableSet *knownPluginMIMETypes()
{
static NSMutableSet *mimeTypes = [[NSMutableSet alloc] init];
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (229942 => 229943)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2018-03-24 05:56:49 UTC (rev 229943)
@@ -483,7 +483,7 @@
- (void)_exitedDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
- (void)_performDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
- (BOOL)_tryToPerformDataInteraction:(id <UIDropSession>)session client:(CGPoint)clientPosition global:(CGPoint)globalPosition operation:(uint64_t)operation;
-- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)clientPosition;
+- (void)_endedDataInteraction:(CGPoint)clientPosition global:(CGPoint)globalPosition;
@property (nonatomic, readonly, getter=_dataInteractionCaretRect) CGRect dataInteractionCaretRect;
#endif
Modified: trunk/Tools/ChangeLog (229942 => 229943)
--- trunk/Tools/ChangeLog 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Tools/ChangeLog 2018-03-24 05:56:49 UTC (rev 229943)
@@ -1,3 +1,12 @@
+2018-03-23 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the build with no pasteboard
+ https://bugs.webkit.org/show_bug.cgi?id=183973
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2018-03-23 Youenn Fablet <you...@apple.com>
Update WPT tools to a1ec330
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (229942 => 229943)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-03-24 02:30:15 UTC (rev 229942)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-03-24 05:56:49 UTC (rev 229943)
@@ -101,7 +101,6 @@
ENABLE_DATA_INTERACTION = $(ENABLE_DATA_INTERACTION_$(WK_PLATFORM_NAME));
ENABLE_DATA_INTERACTION_iphoneos = ENABLE_DATA_INTERACTION;
-ENABLE_DATA_INTERACTION_iphoneminimalsimulator = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION_iphonesimulator = ENABLE_DATA_INTERACTION;
ENABLE_DEVICE_ORIENTATION = $(ENABLE_DEVICE_ORIENTATION_$(WK_PLATFORM_NAME));
@@ -114,7 +113,6 @@
ENABLE_DRAG_SUPPORT = $(ENABLE_DRAG_SUPPORT_$(WK_PLATFORM_NAME));
ENABLE_DRAG_SUPPORT_iphoneos = ENABLE_DRAG_SUPPORT;
-ENABLE_DRAG_SUPPORT_iphoneminimalsimulator = ENABLE_DRAG_SUPPORT;
ENABLE_DRAG_SUPPORT_iphonesimulator = ENABLE_DRAG_SUPPORT;
ENABLE_ENCRYPTED_MEDIA = $(ENABLE_ENCRYPTED_MEDIA_$(WK_PLATFORM_NAME));
