Diff
Modified: trunk/ChangeLog (265227 => 265228)
--- trunk/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,13 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * Source/cmake/OptionsFTW.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2020-07-15 Carlos Garcia Campos <[email protected]>
[GTK4] Enable API tests
Modified: trunk/Source/WTF/ChangeLog (265227 => 265228)
--- trunk/Source/WTF/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WTF/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,13 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * wtf/PlatformEnable.h:
+ * wtf/PlatformEnableCocoa.h:
+
2020-08-01 Commit Queue <[email protected]>
Unreviewed, reverting r265097, r265113, and r265122.
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (265227 => 265228)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -514,10 +514,6 @@
#define ENABLE_XSLT 1
#endif
-#if !defined(ENABLE_DATA_INTERACTION)
-#define ENABLE_DATA_INTERACTION 0
-#endif
-
#if !defined(ENABLE_SERVICE_WORKER)
#define ENABLE_SERVICE_WORKER 1
#endif
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (265227 => 265228)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -164,10 +164,6 @@
#define ENABLE_DARK_MODE_CSS 1
#endif
-#if !defined(ENABLE_DATA_INTERACTION) && !PLATFORM(MAC) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
-#define ENABLE_DATA_INTERACTION 1
-#endif
-
#if !defined(ENABLE_DATACUE_VALUE)
#define ENABLE_DATACUE_VALUE 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (265227 => 265228)
--- trunk/Source/WebCore/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,27 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ `ENABLE(DATA_INTERACTION)` is an alias for `PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)`. It was used early on
+ when bringing drag and drop support to iPad in order to hide the feature from open source WebKit code, and has
+ not been necessary for several years.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::shouldUseCachedImageForDragImage const):
+ * page/DragController.h:
+ (WebCore::DragController::canLoadDataFromDraggingPasteboard const):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::dragCancelled):
+ (WebCore::EventHandler::didStartDrag):
+ * page/FocusController.cpp:
+ (WebCore::shouldClearSelectionWhenChangingFocusedElement):
+ * page/mac/DragControllerMac.mm:
+ * platform/DragImage.cpp:
+ * platform/ios/WebItemProviderPasteboard.mm:
+
2020-08-03 Chris Dumez <[email protected]>
Add constructor for GainNode
Modified: trunk/Source/WebCore/PAL/ChangeLog (265227 => 265228)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,12 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * pal/spi/ios/UIKitSPI.h:
+
2020-08-03 Per Arne Vollan <[email protected]>
Finalize the list of MobileGestalt queries needed to populate the in-memory cache in the WebContent process
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h (265227 => 265228)
--- trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -43,12 +43,9 @@
#import <UIKit/UIInterface_Private.h>
#import <UIKit/UIScreen_Private.h>
#import <UIKit/UIViewController_Private.h>
-
-#if ENABLE(DATA_INTERACTION)
#import <UIKit/NSItemProvider+UIKitAdditions.h>
#import <UIKit/NSItemProvider+UIKitAdditions_Private.h>
#import <UIKit/NSURL+UIItemProvider.h>
-#endif
@interface UIApplication ()
+ (UIApplicationSceneClassicMode)_classicMode;
Modified: trunk/Source/WebCore/page/DragController.cpp (265227 => 265228)
--- trunk/Source/WebCore/page/DragController.cpp 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/page/DragController.cpp 2020-08-03 22:48:47 UTC (rev 265228)
@@ -95,7 +95,7 @@
#include "DataDetection.h"
#endif
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
#include "SelectionRect.h"
#endif
@@ -382,7 +382,7 @@
return host ? host : element;
}
-#if !ENABLE(DATA_INTERACTION)
+#if !PLATFORM(IOS_FAMILY)
void DragController::updateSupportedTypeIdentifiersForDragHandlingMethod(DragHandlingMethod, const DragData&) const
{
@@ -1522,7 +1522,7 @@
bool DragController::shouldUseCachedImageForDragImage(const Image& image) const
{
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
UNUSED_PARAM(image);
return true;
#else
Modified: trunk/Source/WebCore/page/DragController.h (265227 => 265228)
--- trunk/Source/WebCore/page/DragController.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/page/DragController.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -130,7 +130,7 @@
bool canLoadDataFromDraggingPasteboard() const
{
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
return m_isPerformingDrop;
#else
return true;
Modified: trunk/Source/WebCore/page/EventHandler.cpp (265227 => 265228)
--- trunk/Source/WebCore/page/EventHandler.cpp 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2020-08-03 22:48:47 UTC (rev 265228)
@@ -3690,7 +3690,7 @@
void EventHandler::dragCancelled()
{
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
if (auto* page = m_frame.page())
removeDraggedContentDocumentMarkersFromAllFramesInPage(*page);
#endif
@@ -3698,7 +3698,7 @@
void EventHandler::didStartDrag()
{
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
auto dragSource = dragState().source;
if (!dragSource)
return;
Modified: trunk/Source/WebCore/page/FocusController.cpp (265227 => 265228)
--- trunk/Source/WebCore/page/FocusController.cpp 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/page/FocusController.cpp 2020-08-03 22:48:47 UTC (rev 265228)
@@ -805,7 +805,7 @@
static bool shouldClearSelectionWhenChangingFocusedElement(const Page& page, RefPtr<Element> oldFocusedElement, RefPtr<Element> newFocusedElement)
{
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
if (newFocusedElement || !oldFocusedElement)
return true;
Modified: trunk/Source/WebCore/page/mac/DragControllerMac.mm (265227 => 265228)
--- trunk/Source/WebCore/page/mac/DragControllerMac.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/page/mac/DragControllerMac.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -47,7 +47,7 @@
#import "Range.h"
#import "RuntimeEnabledFeatures.h"
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
#import <MobileCoreServices/MobileCoreServices.h>
#endif
@@ -105,7 +105,7 @@
#endif
}
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
DragOperation DragController::platformGenericDragOperation()
{
@@ -146,7 +146,7 @@
platformStrategies()->pasteboardStrategy()->updateSupportedTypeIdentifiers(supportedTypes, dragData.pasteboardName());
}
-#endif
+#endif // PLATFORM(IOS_FAMILY)
void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
{
Modified: trunk/Source/WebCore/platform/DragImage.cpp (265227 => 265228)
--- trunk/Source/WebCore/platform/DragImage.cpp 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2020-08-03 22:48:47 UTC (rev 265228)
@@ -120,7 +120,7 @@
return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
}
-#if !ENABLE(DATA_INTERACTION)
+#if !PLATFORM(IOS_FAMILY) || !ENABLE(DRAG_SUPPORT)
DragImageRef createDragImageForSelection(Frame& frame, TextIndicatorData&, bool forceBlackText)
{
@@ -213,7 +213,7 @@
return createDragImageFromSnapshot(snapshotNode(frame, node), &node);
}
-#if !ENABLE(DATA_INTERACTION)
+#if !PLATFORM(IOS_FAMILY) || !ENABLE(DRAG_SUPPORT)
DragImageRef platformAdjustDragImageForDeviceScaleFactor(DragImageRef image, float deviceScaleFactor)
{
// Later code expects the drag image to be scaled by device's scale factor.
Modified: trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm (265227 => 265228)
--- trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WebItemProviderPasteboard.h"
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
#import <Foundation/NSItemProvider.h>
#import <Foundation/NSProgress.h>
@@ -871,4 +871,4 @@
@end
-#endif // ENABLE(DATA_INTERACTION)
+#endif // PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/ChangeLog (265227 => 265228)
--- trunk/Source/WebKit/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,26 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/DragDropInteractionState.h:
+ * UIProcess/ios/DragDropInteractionState.mm:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setUpInteraction]):
+ (-[WKContentView cleanUpInteraction]):
+ (-[WKContentView actionSheetAssistant:showCustomSheetForElement:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+
2020-08-03 Tim Horton <[email protected]>
Fix the macCatalyst build
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -507,7 +507,7 @@
virtual void requestPasswordForQuickLookDocument(const String& fileName, WTF::Function<void(const String&)>&&) = 0;
#endif
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
virtual void didHandleDragStartRequest(bool started) = 0;
virtual void didHandleAdditionalDragItemsRequest(bool added) = 0;
virtual void willReceiveEditDragSnapshot() = 0;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-08-03 22:48:47 UTC (rev 265228)
@@ -2486,7 +2486,7 @@
setDragCaretRect({ });
}
-#if !ENABLE(DATA_INTERACTION)
+#if !PLATFORM(IOS_FAMILY) || !ENABLE(DRAG_SUPPORT)
void WebPageProxy::setDragCaretRect(const IntRect& dragCaretRect)
{
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2020-08-03 22:48:47 UTC (rev 265228)
@@ -323,7 +323,7 @@
DidPerformDragOperation(bool handled)
#endif
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
DidHandleDragStartRequest(bool started)
DidHandleAdditionalDragItemsRequest(bool added)
WillReceiveEditDragSnapshot()
Modified: trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.h (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -25,7 +25,7 @@
#pragma once
-#if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
#import "UIKitSPI.h"
#import <WebCore/DragActions.h>
@@ -133,4 +133,4 @@
} // namespace WebKit
-#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.mm (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/DragDropInteractionState.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -26,7 +26,7 @@
#import "config.h"
#import "DragDropInteractionState.h"
-#if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
#import "Logging.h"
#import <WebCore/DragItem.h>
@@ -417,4 +417,4 @@
} // namespace WebKit
-#endif // ENABLE(DRAG_SUPPORT) && PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -242,7 +242,7 @@
void requestDOMPasteAccess(const WebCore::IntRect& elementRect, const String&, CompletionHandler<void(WebCore::DOMPasteAccessResponse)>&&) final;
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
void didPerformDragOperation(bool handled) override;
void didHandleDragStartRequest(bool started) override;
void didHandleAdditionalDragItemsRequest(bool added) override;
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -858,7 +858,7 @@
}
#endif
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
void PageClientImpl::didPerformDragOperation(bool handled)
{
[m_contentView _didPerformDragOperation:handled];
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -395,7 +395,7 @@
Optional<UChar32> _lastInsertedCharacterToOverrideCharacterBeforeSelection;
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
WebKit::DragDropInteractionState _dragDropInteractionState;
RetainPtr<UIDragInteraction> _dragInteraction;
RetainPtr<UIDropInteraction> _dropInteraction;
@@ -428,7 +428,7 @@
#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
, WKShareSheetDelegate
#endif
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
, UIDragInteractionDelegate, UIDropInteractionDelegate
#endif
#if PLATFORM(IOS_FAMILY)
@@ -566,7 +566,7 @@
- (void)doAfterPositionInformationUpdate:(void (^)(WebKit::InteractionInformationAtPosition))action forRequest:(WebKit::InteractionInformationRequest)request;
- (BOOL)ensurePositionInformationIsUpToDate:(WebKit::InteractionInformationRequest)request;
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
- (void)_didChangeDragInteractionPolicy;
- (void)_didPerformDragOperation:(BOOL)handled;
- (void)_didHandleDragStartRequest:(BOOL)started;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -828,7 +828,7 @@
[self _updateLongPressAndHighlightLongPressGestures];
#endif
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
[self setUpDragAndDropInteractions];
#endif
@@ -1003,7 +1003,7 @@
_layerTreeTransactionIdAtLastInteractionStart = { };
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
[existingLocalDragSessionContext(_dragDropInteractionState.dragSession()) cleanUpTemporaryDirectories];
[self teardownDragAndDropInteractions];
#endif
@@ -7014,7 +7014,7 @@
if ([uiDelegate respondsToSelector:@selector(_webView:showCustomSheetForElement:)]) {
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if ([uiDelegate _webView:self.webView showCustomSheetForElement:element]) {
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
BOOL shouldCancelAllTouches = !_dragDropInteractionState.dragSession();
#else
BOOL shouldCancelAllTouches = YES;
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (265227 => 265228)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1248,7 +1248,7 @@
sendWithAsyncReply(Messages::WebPage::RequestDocumentEditingContext(request), WTFMove(completionHandler));
}
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
void WebPageProxy::didHandleDragStartRequest(bool started)
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (265227 => 265228)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1410,7 +1410,7 @@
void shrinkToFitContent(ZoomToInitialScale = ZoomToInitialScale::No);
#endif
-#if PLATFORM(IOS_FAMILY) && ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
void requestDragStart(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask);
void requestAdditionalItemsForDragSession(const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask);
void insertDroppedImagePlaceholders(const Vector<WebCore::IntSize>&, CompletionHandler<void(const Vector<WebCore::IntRect>&, Optional<WebCore::TextIndicatorData>)>&& reply);
@@ -1942,7 +1942,7 @@
OptionSet<WebCore::DragSourceAction> m_allowedDragSourceActions { WebCore::anyDragSourceAction() };
#endif
-#if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
HashSet<RefPtr<WebCore::HTMLImageElement>> m_pendingImageElementsForDropSnapshot;
Optional<WebCore::SimpleRange> m_rangeForDropSnapshot;
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (265227 => 265228)
--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -915,7 +915,7 @@
send(Messages::WebPageProxy::FocusedElementInformationCallback(info, callbackID));
}
-#if ENABLE(DATA_INTERACTION)
+#if ENABLE(DRAG_SUPPORT)
void WebPage::requestDragStart(const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask)
{
SetForScope<OptionSet<WebCore::DragSourceAction>> allowedActionsForScope(m_allowedDragSourceActions, allowedActionsMask);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (265227 => 265228)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,3 +1,15 @@
+2020-08-03 Wenson Hsieh <[email protected]>
+
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * WebCoreSupport/WebDragClient.mm:
+ * WebView/WebView.mm:
+ * WebView/WebViewData.h:
+ * WebView/WebViewInternal.h:
+
2020-08-02 Darin Adler <[email protected]>
Remove some member functions of Range and many calls to createLiveRange
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm (265227 => 265228)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -198,7 +198,7 @@
[[NSPasteboard pasteboardWithName:pasteboardName] _web_declareAndWriteDragImageForElement:kit(&element) URL:url title:title archive:[kit(&element) webArchive] source:getTopHTMLView(frame)];
}
-#elif !ENABLE(DATA_INTERACTION)
+#elif !PLATFORM(IOS_FAMILY) || !ENABLE(DRAG_SUPPORT)
bool WebDragClient::useLegacyDragClient()
{
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (265227 => 265228)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -345,12 +345,9 @@
#import <WebCore/PlaybackSessionModelMediaElement.h>
#endif
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY)
#import <UIKit/UIColor.h>
#import <UIKit/UIImage.h>
-#endif
-
-#if ENABLE(DATA_INTERACTION)
#import <pal/ios/UIKitSoftLink.h>
#endif
@@ -791,7 +788,7 @@
} // namespace WebKit
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
@implementation WebUITextIndicatorData
@@ -864,7 +861,7 @@
#elif !PLATFORM(MAC)
@implementation WebUITextIndicatorData
@end
-#endif // ENABLE(DATA_INTERACTION)
+#endif
NSString *WebElementDOMNodeKey = @"WebElementDOMNode";
NSString *WebElementFrameKey = @"WebElementFrame";
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h (265227 => 265228)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -284,7 +284,7 @@
CGRect pendingFixedPositionLayoutRect;
#endif
-#if ENABLE(DATA_INTERACTION)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
RetainPtr<WebUITextIndicatorData> textIndicatorData;
RetainPtr<WebUITextIndicatorData> dataOperationTextIndicator;
CGRect dragPreviewFrameInRootViewCoordinates;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h (265227 => 265228)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h 2020-08-03 22:48:47 UTC (rev 265228)
@@ -109,7 +109,7 @@
OptionSet<WebCore::LayoutMilestone> coreLayoutMilestones(WebLayoutMilestones);
WebLayoutMilestones kitLayoutMilestones(OptionSet<WebCore::LayoutMilestone>);
-#if ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT) && defined(__cplusplus)
@interface WebUITextIndicatorData (WebUITextIndicatorInternal)
- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image textIndicatorData:(const WebCore::TextIndicatorData&)indicatorData scale:(CGFloat)scale;
- (WebUITextIndicatorData *)initWithImage:(CGImageRef)image scale:(CGFloat)scale;
@@ -275,7 +275,7 @@
#endif
#endif
-#if ENABLE(DATA_INTERACTION) && defined(__cplusplus)
+#if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT) && defined(__cplusplus)
- (void)_startDrag:(const WebCore::DragItem&)dragItem;
- (void)_didConcludeEditDrag;
#endif
Modified: trunk/Source/cmake/OptionsFTW.cmake (265227 => 265228)
--- trunk/Source/cmake/OptionsFTW.cmake 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/cmake/OptionsFTW.cmake 2020-08-03 22:48:47 UTC (rev 265228)
@@ -144,7 +144,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATACUE_VALUE PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_INTERACTION PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PRIVATE OFF)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (265227 => 265228)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-08-03 22:48:47 UTC (rev 265228)
@@ -130,7 +130,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_DARK_MODE_CSS "Toggle Dark Mode CSS support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DATACUE_VALUE "Toggle datacue value support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle Datalist Element support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_DATA_INTERACTION "Toggle data interaction support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DEVICE_ORIENTATION "Toggle Device Orientation support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_DFG_JIT "Toggle data flow graph JIT tier" PRIVATE ${ENABLE_JIT_DEFAULT})
WEBKIT_OPTION_DEFINE(ENABLE_DOWNLOAD_ATTRIBUTE "Toggle Download Attribute support" PRIVATE OFF)
Modified: trunk/Tools/ChangeLog (265227 => 265228)
--- trunk/Tools/ChangeLog 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Tools/ChangeLog 2020-08-03 22:48:47 UTC (rev 265228)
@@ -1,5 +1,14 @@
2020-08-03 Wenson Hsieh <[email protected]>
+ Remove the ENABLE_DATA_INTERACTION feature flag
+ https://bugs.webkit.org/show_bug.cgi?id=215091
+
+ Reviewed by Megan Gardner.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
+2020-08-03 Wenson Hsieh <[email protected]>
+
[iOS 14] editing/selection/ios/select-all-non-editable-text-using-keyboard.html sometimes times out
https://bugs.webkit.org/show_bug.cgi?id=215089
<rdar://problem/66282806>
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (265227 => 265228)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-08-03 22:41:32 UTC (rev 265227)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2020-08-03 22:48:47 UTC (rev 265228)
@@ -80,7 +80,6 @@
$cssTypedOMSupport,
$cursorVisibilitySupport,
$darkModeCSSSupport,
- $dataInteractionSupport,
$datacueValueSupport,
$datalistElementSupport,
$deviceOrientationSupport,
@@ -292,9 +291,6 @@
{ option => "datalist-element", desc => "Toggle Datalist Element support",
define => "ENABLE_DATALIST_ELEMENT", value => \$datalistElementSupport },
- { option => "data-interaction", desc => "Toggle data interaction support",
- define => "ENABLE_DATA_INTERACTION", value => \$dataInteractionSupport },
-
{ option => "device-orientation", desc => "Toggle Device Orientation support",
define => "ENABLE_DEVICE_ORIENTATION", value => \$deviceOrientationSupport },