Changeset 262190 in webkit

Timestamp:

May 27, 2020 3:23:17 AM (4 years ago)

Author:

ddkilzer@apple.com

Message:

Use OptionSet<DragDestinationAction> for mask values
<​https://webkit.org/b/212115>
<rdar://problem/63423380>

Reviewed by Alex Christensen.

Source/WebCore:

DragDestinationAction is used as both individual values and as a
bit mask. This changes bit mask uses to OptionSet<> and renames
variables to denote masks.

• page/DragActions.h:

(WebCore::DragDestinationAction):

• Convert to enum class and remove *None and *Any values.

(WebCore::DragDestinationActionAny):

• Add helper function to return OptionSet<DragDestinationAction> with all values set.
• page/DragController.cpp:

(WebCore::DragController::performDragOperation):
(WebCore::DragController::dragEnteredOrUpdated):
(WebCore::DragController::tryDocumentDrag):
(WebCore::DragController::concludeEditDrag):

• page/DragController.h:

(WebCore::DragController::dragDestinationAction const): Rename.
(WebCore::DragController::dragDestinationActionMask const):

• Rename dragDestinationAction() to dragDestinationActionMask().
• platform/DragData.cpp:

(WebCore::DragData::DragData):

• platform/DragData.h:

(WebCore::DragData::DragData):

• Use DragDestinationActionAny() in place of removed DragDestinationActionAny.

(WebCore::DragData::dragDestinationAction const): Rename.
(WebCore::DragData::dragDestinationActionMask const):

• Rename dragDestinationAction() to dragDestinationActionMask().

(WebCore::DragData::operator =):

• platform/cocoa/DragDataCocoa.mm:

(WebCore::DragData::DragData):

Source/WebKit:

• Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<DragData>::encode):
(IPC::ArgumentCoder<DragData>::decode):

• Switch from decodeEnum() and encodeEnum() to modern equivalents that check for valid enum values.
• UIProcess/Cocoa/WebViewImpl.mm:

(WebKit::WebViewImpl::draggingEntered):
(WebKit::WebViewImpl::draggingUpdated):

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView dragDataForDropSession:dragDestinationAction:]):

• WebProcess/WebCoreSupport/WebDragClient.cpp:

(WebKit::WebDragClient::willPerformDragDestinationAction):

Source/WebKitLegacy/mac:

• WebCoreSupport/WebDragClient.mm:

(WebDragClient::willPerformDragDestinationAction):

• WebView/WebView.mm:

(-[WebView dragDataForSession:client:global:operation:]):
(-[WebView actionMaskForDraggingInfo:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/DragActions.h (modified) (2 diffs)
• WebCore/page/DragController.cpp (modified) (11 diffs)
• WebCore/page/DragController.h (modified) (4 diffs)
• WebCore/platform/DragData.cpp (modified) (4 diffs)
• WebCore/platform/DragData.h (modified) (6 diffs)
• WebCore/platform/cocoa/DragDataCocoa.mm (modified) (5 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)
• WebKit/UIProcess/Cocoa/WebViewImpl.mm (modified) (3 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)
• WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp (modified) (2 diffs)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm (modified) (3 diffs)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-27  David Kilzer  <ddkilzer@apple.com>
+
+        Use OptionSet<DragDestinationAction> for mask values
+        <https://webkit.org/b/212115>
+        <rdar://problem/63423380>
+
+        Reviewed by Alex Christensen.
+
+        DragDestinationAction is used as both individual values and as a
+        bit mask. This changes bit mask uses to OptionSet<> and renames
+        variables to denote masks.
+
+        * page/DragActions.h:
+        (WebCore::DragDestinationAction):
+        - Convert to enum class and remove *None and *Any values.
+        (WebCore::DragDestinationActionAny):
+        - Add helper function to return OptionSet<DragDestinationAction>
+          with all values set.
+        * page/DragController.cpp:
+        (WebCore::DragController::performDragOperation):
+        (WebCore::DragController::dragEnteredOrUpdated):
+        (WebCore::DragController::tryDocumentDrag):
+        (WebCore::DragController::concludeEditDrag):
+        * page/DragController.h:
+        (WebCore::DragController::dragDestinationAction const): Rename.
+        (WebCore::DragController::dragDestinationActionMask const):
+        - Rename dragDestinationAction() to dragDestinationActionMask().
+        * platform/DragData.cpp:
+        (WebCore::DragData::DragData):
+        * platform/DragData.h:
+        (WebCore::DragData::DragData):
+        - Use DragDestinationActionAny() in place of removed
+          DragDestinationActionAny.
+        (WebCore::DragData::dragDestinationAction const): Rename.
+        (WebCore::DragData::dragDestinationActionMask const):
+        - Rename dragDestinationAction() to dragDestinationActionMask().
+        (WebCore::DragData::operator =):
+        * platform/cocoa/DragDataCocoa.mm:
+        (WebCore::DragData::DragData):
+
 2020-05-27  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/page/DragActions.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2007-2018 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 
 #include <limits.h>
+#include <wtf/EnumTraits.h>
 #include <wtf/Forward.h>
+#include <wtf/OptionSet.h>
 
 namespace WebCore {
 
-// WebCoreDragDestinationAction should be kept in sync with WebDragDestinationAction.
-typedef enum {
-    DragDestinationActionNone    = 0,
-    DragDestinationActionDHTML   = 1,
-    DragDestinationActionEdit    = 2,
-    DragDestinationActionLoad    = 4,
-    DragDestinationActionAny     = UINT_MAX
-} DragDestinationAction;
+// WebCore::DragDestinationAction must be kept in sync with WebDragDestinationAction and WKDragDestinationAction.
+enum class DragDestinationAction : uint8_t {
+    DHTML = 1,
+    Edit  = 2,
+    Load  = 4
+};
+
+inline constexpr OptionSet<DragDestinationAction> DragDestinationActionAny()
+{
+    return OptionSet<DragDestinationAction> { DragDestinationAction::DHTML, DragDestinationAction::Edit, DragDestinationAction::Load };
+}
 
 // WebCoreDragSourceAction should be kept in sync with WebDragSourceAction.

trunk/Source/WebCore/page/DragController.cpp

@@ -256 +256 @@
         shouldOpenExternalURLsPolicy = m_documentUnderMouse->shouldOpenExternalURLsPolicyToPropagate();
 
-    if ((m_dragDestinationAction & DragDestinationActionDHTML) && dragIsHandledByDocument(m_dragHandlingMethod)) {
-        client().willPerformDragDestinationAction(DragDestinationActionDHTML, dragData);
+    if ((m_dragDestinationActionMask.contains(DragDestinationAction::DHTML)) && dragIsHandledByDocument(m_dragHandlingMethod)) {
+        client().willPerformDragDestinationAction(DragDestinationAction::DHTML, dragData);
         Ref<Frame> mainFrame(m_page.mainFrame());
         bool preventedDefault = false;
@@ -269 +269 @@
     }
 
-    if ((m_dragDestinationAction & DragDestinationActionEdit) && concludeEditDrag(dragData)) {
+    if ((m_dragDestinationActionMask.contains(DragDestinationAction::Edit)) && concludeEditDrag(dragData)) {
         client().didConcludeEditDrag();
         m_documentUnderMouse = nullptr;
@@ -286 +286 @@
         return false;
 
-    client().willPerformDragDestinationAction(DragDestinationActionLoad, dragData);
+    client().willPerformDragDestinationAction(DragDestinationAction::Load, dragData);
     FrameLoadRequest frameLoadRequest { m_page.mainFrame(), ResourceRequest { urlString } };
     frameLoadRequest.setShouldOpenExternalURLsPolicy(shouldOpenExternalURLsPolicy);
@@ -309 +309 @@
     mouseMovedIntoDocument(m_page.mainFrame().documentAtPoint(dragData.clientPosition()));
 
-    m_dragDestinationAction = dragData.dragDestinationAction();
-    if (m_dragDestinationAction == DragDestinationActionNone) {
+    m_dragDestinationActionMask = dragData.dragDestinationActionMask();
+    if (m_dragDestinationActionMask.isEmpty()) {
         clearDragCaret(); // FIXME: Why not call mouseMovedIntoDocument(nullptr)?
         return DragOperationNone;
@@ -316 +316 @@
 
     DragOperation dragOperation = DragOperationNone;
-    m_dragHandlingMethod = tryDocumentDrag(dragData, m_dragDestinationAction, dragOperation);
-    if (m_dragHandlingMethod == DragHandlingMethod::None && (m_dragDestinationAction & DragDestinationActionLoad)) {
+    m_dragHandlingMethod = tryDocumentDrag(dragData, m_dragDestinationActionMask, dragOperation);
+    if (m_dragHandlingMethod == DragHandlingMethod::None && (m_dragDestinationActionMask.contains(DragDestinationAction::Load))) {
         dragOperation = operationForLoad(dragData);
         if (dragOperation != DragOperationNone)
@@ -389 +389 @@
 #endif
 
-DragHandlingMethod DragController::tryDocumentDrag(const DragData& dragData, DragDestinationAction actionMask, DragOperation& dragOperation)
+DragHandlingMethod DragController::tryDocumentDrag(const DragData& dragData, OptionSet<DragDestinationAction> destinationActionMask, DragOperation& dragOperation)
 {
     if (!m_documentUnderMouse)
@@ -398 +398 @@
 
     bool isHandlingDrag = false;
-    if (actionMask & DragDestinationActionDHTML) {
+    if (destinationActionMask.contains(DragDestinationAction::DHTML)) {
         isHandlingDrag = tryDHTMLDrag(dragData, dragOperation);
         // Do not continue if m_documentUnderMouse has been reset by tryDHTMLDrag.
@@ -421 +421 @@
     }
 
-    if ((actionMask & DragDestinationActionEdit) && canProcessDrag(dragData)) {
+    if (destinationActionMask.contains(DragDestinationAction::Edit) && canProcessDrag(dragData)) {
         if (dragData.containsColor()) {
             dragOperation = DragOperationGeneric;
@@ -570 +570 @@
         if (!innerFrame->editor().shouldApplyStyle(style.ptr(), createLiveRange(innerRange).get()))
             return false;
-        client().willPerformDragDestinationAction(DragDestinationActionEdit, dragData);
+        client().willPerformDragDestinationAction(DragDestinationAction::Edit, dragData);
         innerFrame->editor().applyStyle(style.ptr(), EditAction::SetColor);
         return true;
@@ -606 +606 @@
             return false;
 
-        client().willPerformDragDestinationAction(DragDestinationActionEdit, dragData);
+        client().willPerformDragDestinationAction(DragDestinationAction::Edit, dragData);
 
         if (editor.client() && editor.client()->performTwoStepDrop(*fragment, createLiveRange(*range), isMove))
@@ -632 +632 @@
             return false;
 
-        client().willPerformDragDestinationAction(DragDestinationActionEdit, dragData);
+        client().willPerformDragDestinationAction(DragDestinationAction::Edit, dragData);
         auto fragment = createFragmentFromText(createLiveRange(*range), text);
         if (editor.client() && editor.client()->performTwoStepDrop(fragment.get(), createLiveRange(*range), isMove))

trunk/Source/WebCore/page/DragController.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80 +80 @@
 
         Document* documentUnderMouse() const { return m_documentUnderMouse.get(); }
-        DragDestinationAction dragDestinationAction() const { return m_dragDestinationAction; }
+        OptionSet<DragDestinationAction> dragDestinationActionMask() const { return m_dragDestinationActionMask; }
         DragSourceAction delegateDragSourceAction(const IntPoint& rootViewPoint);
         
@@ -109 +109 @@
         DragOperation dragEnteredOrUpdated(const DragData&);
         DragOperation operationForLoad(const DragData&);
-        DragHandlingMethod tryDocumentDrag(const DragData&, DragDestinationAction, DragOperation&);
+        DragHandlingMethod tryDocumentDrag(const DragData&, OptionSet<DragDestinationAction>, DragOperation&);
         bool tryDHTMLDrag(const DragData&, DragOperation&);
         DragOperation dragOperation(const DragData&);
@@ -150 +150 @@
         DragHandlingMethod m_dragHandlingMethod { DragHandlingMethod::None };
 
-        DragDestinationAction m_dragDestinationAction { DragDestinationActionNone };
+        OptionSet<DragDestinationAction> m_dragDestinationActionMask;
         DragSourceAction m_dragSourceAction { DragSourceActionNone };
         bool m_didInitiateDrag { false };

trunk/Source/WebCore/platform/DragData.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +33 @@
 
 #if !PLATFORM(COCOA)
-DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, DragDestinationAction destinationAction)
+DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, OptionSet<DragDestinationAction> destinationActionMask)
     : m_clientPosition(clientPosition)
     , m_globalPosition(globalPosition)
@@ -39 +39 @@
     , m_draggingSourceOperationMask(sourceOperationMask)
     , m_applicationFlags(flags)
-    , m_dragDestinationAction(destinationAction)
+    , m_dragDestinationActionMask(destinationActionMask)
 {  
 }
 
-DragData::DragData(const String&, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, DragDestinationAction destinationAction)
+DragData::DragData(const String&, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, OptionSet<DragDestinationAction> destinationActionMask)
     : m_clientPosition(clientPosition)
     , m_globalPosition(globalPosition)
@@ -49 +49 @@
     , m_draggingSourceOperationMask(sourceOperationMask)
     , m_applicationFlags(flags)
-    , m_dragDestinationAction(destinationAction)
+    , m_dragDestinationActionMask(destinationActionMask)
 {
 }

trunk/Source/WebCore/platform/DragData.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31 +31 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
+#include <wtf/OptionSet.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
@@ -75 +76 @@
 
     // clientPosition is taken to be the position of the drag event within the target window, with (0,0) at the top left
-    WEBCORE_EXPORT DragData(DragDataRef, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone, DragDestinationAction actions = DragDestinationActionAny);
-    WEBCORE_EXPORT DragData(const String& dragStorageName, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone, DragDestinationAction actions = DragDestinationActionAny);
+    WEBCORE_EXPORT DragData(DragDataRef, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone, OptionSet<DragDestinationAction> actionMask = DragDestinationActionAny());
+    WEBCORE_EXPORT DragData(const String& dragStorageName, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation, DragApplicationFlags = DragApplicationNone, OptionSet<DragDestinationAction> actionMask = DragDestinationActionAny());
     // This constructor should used only by WebKit2 IPC because DragData
     // is initialized by the decoder and not in the constructor.
-    DragData() { }
+    DragData() = default;
 #if PLATFORM(WIN)
     WEBCORE_EXPORT DragData(const DragDataMap&, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags = DragApplicationNone);
@@ -102 +103 @@
     bool containsFiles() const;
     unsigned numberOfFiles() const;
-    DragDestinationAction dragDestinationAction() const { return m_dragDestinationAction; }
+    OptionSet<DragDestinationAction> dragDestinationActionMask() const { return m_dragDestinationActionMask; }
     void setFileNames(Vector<String>& fileNames) { m_fileNames = WTFMove(fileNames); }
     const Vector<String>& fileNames() const { return m_fileNames; }
@@ -120 +121 @@
         m_draggingSourceOperationMask = data.m_draggingSourceOperationMask;
         m_applicationFlags = data.m_applicationFlags;
-        m_dragDestinationAction = data.m_dragDestinationAction;
+        m_dragDestinationActionMask = data.m_dragDestinationActionMask;
         return *this;
     }
@@ -132 +133 @@
     DragApplicationFlags m_applicationFlags;
     Vector<String> m_fileNames;
-    DragDestinationAction m_dragDestinationAction;
+    OptionSet<DragDestinationAction> m_dragDestinationActionMask;
 #if PLATFORM(COCOA)
     String m_pasteboardName;

trunk/Source/WebCore/platform/cocoa/DragDataCocoa.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2007-2020 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -117 +117 @@
 }
 
-DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, DragDestinationAction destinationAction)
+DragData::DragData(DragDataRef data, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, OptionSet<DragDestinationAction> destinationActionMask)
     : m_clientPosition(clientPosition)
     , m_globalPosition(globalPosition)
@@ -123 +123 @@
     , m_draggingSourceOperationMask(sourceOperationMask)
     , m_applicationFlags(flags)
-    , m_dragDestinationAction(destinationAction)
+    , m_dragDestinationActionMask(destinationActionMask)
 #if PLATFORM(MAC)
     , m_pasteboardName([[m_platformDragData draggingPasteboard] name])
@@ -132 +132 @@
 }
 
-DragData::DragData(const String& dragStorageName, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, DragDestinationAction destinationAction)
+DragData::DragData(const String& dragStorageName, const IntPoint& clientPosition, const IntPoint& globalPosition, DragOperation sourceOperationMask, DragApplicationFlags flags, OptionSet<DragDestinationAction> destinationActionMask)
     : m_clientPosition(clientPosition)
     , m_globalPosition(globalPosition)
@@ -138 +138 @@
     , m_draggingSourceOperationMask(sourceOperationMask)
     , m_applicationFlags(flags)
-    , m_dragDestinationAction(destinationAction)
+    , m_dragDestinationActionMask(destinationActionMask)
     , m_pasteboardName(dragStorageName)
 {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-27  David Kilzer  <ddkilzer@apple.com>
+
+        Use OptionSet<DragDestinationAction> for mask values
+        <https://webkit.org/b/212115>
+        <rdar://problem/63423380>
+
+        Reviewed by Alex Christensen.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<DragData>::encode):
+        (IPC::ArgumentCoder<DragData>::decode):
+        - Switch from decodeEnum() and encodeEnum() to modern
+          equivalents that check for valid enum values.
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::WebViewImpl::draggingEntered):
+        (WebKit::WebViewImpl::draggingUpdated):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView dragDataForDropSession:dragDestinationAction:]):
+        * WebProcess/WebCoreSupport/WebDragClient.cpp:
+        (WebKit::WebDragClient::willPerformDragDestinationAction):
+
 2020-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp

@@ -1538 +1538 @@
     encoder << dragData.fileNames();
 #endif
-    encoder.encodeEnum(dragData.dragDestinationAction());
+    encoder << dragData.dragDestinationActionMask();
 }
 
@@ -1569 +1569 @@
 #endif
 
-    DragDestinationAction destinationAction;
-    if (!decoder.decodeEnum(destinationAction))
-        return false;
-
-    dragData = DragData(pasteboardName, clientPosition, globalPosition, draggingSourceOperationMask, applicationFlags, destinationAction);
+    OptionSet<DragDestinationAction> dragDestinationActionMask;
+    if (!decoder.decode(dragDestinationActionMask))
+        return false;
+
+    dragData = DragData(pasteboardName, clientPosition, globalPosition, draggingSourceOperationMask, applicationFlags, dragDestinationActionMask);
     dragData.setFileNames(fileNames);
 

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -3946 +3946 @@
     WebCore::IntPoint client([m_view convertPoint:draggingInfo.draggingLocation fromView:nil]);
     WebCore::IntPoint global(WebCore::globalPoint(draggingInfo.draggingLocation, [m_view window]));
-    auto dragDestinationAction = static_cast<WebCore::DragDestinationAction>([m_view _web_dragDestinationActionForDraggingInfo:draggingInfo]);
-    WebCore::DragData dragData(draggingInfo, client, global, static_cast<WebCore::DragOperation>(draggingInfo.draggingSourceOperationMask), applicationFlagsForDrag(m_view.getAutoreleased(), draggingInfo), dragDestinationAction);
+    auto dragDestinationActionMask = OptionSet<WebCore::DragDestinationAction>::fromRaw([m_view _web_dragDestinationActionForDraggingInfo:draggingInfo]);
+    WebCore::DragData dragData(draggingInfo, client, global, static_cast<WebCore::DragOperation>(draggingInfo.draggingSourceOperationMask), applicationFlagsForDrag(m_view.getAutoreleased(), draggingInfo), dragDestinationActionMask);
 
     m_page->resetCurrentDragInformation();
@@ -3959 +3959 @@
     WebCore::IntPoint client([m_view convertPoint:draggingInfo.draggingLocation fromView:nil]);
     WebCore::IntPoint global(WebCore::globalPoint(draggingInfo.draggingLocation, [m_view window]));
-    auto dragDestinationAction = static_cast<WebCore::DragDestinationAction>([m_view _web_dragDestinationActionForDraggingInfo:draggingInfo]);
-    WebCore::DragData dragData(draggingInfo, client, global, static_cast<WebCore::DragOperation>(draggingInfo.draggingSourceOperationMask), applicationFlagsForDrag(m_view.getAutoreleased(), draggingInfo), dragDestinationAction);
+    auto dragDestinationActionMask = OptionSet<WebCore::DragDestinationAction>::fromRaw([m_view _web_dragDestinationActionForDraggingInfo:draggingInfo]);
+    WebCore::DragData dragData(draggingInfo, client, global, static_cast<WebCore::DragOperation>(draggingInfo.draggingSourceOperationMask), applicationFlagsForDrag(m_view.getAutoreleased(), draggingInfo), dragDestinationActionMask);
     m_page->dragUpdated(dragData, draggingInfo.draggingPasteboard.name);
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -7312 +7312 @@
 
     WebCore::DragOperation dragOperationMask = static_cast<WebCore::DragOperation>(session.allowsMoveOperation ? WebCore::DragOperationEvery : (WebCore::DragOperationEvery & ~WebCore::DragOperationMove));
-    return { session, WebCore::roundedIntPoint(client), WebCore::roundedIntPoint(global), dragOperationMask, WebCore::DragApplicationNone, static_cast<WebCore::DragDestinationAction>(dragDestinationAction) };
+    auto dragDestinationActionMask = OptionSet<WebCore::DragDestinationAction>::fromRaw(dragDestinationAction);
+    return { session, WebCore::roundedIntPoint(client), WebCore::roundedIntPoint(global), dragOperationMask, WebCore::DragApplicationNone, dragDestinationActionMask };
 }
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +36 @@
 void WebDragClient::willPerformDragDestinationAction(DragDestinationAction action, const DragData&)
 {
-    if (action == DragDestinationActionLoad)
+    if (action == DragDestinationAction::Load)
         m_page->willPerformLoadDragDestinationAction();
     else

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2020-05-27  David Kilzer  <ddkilzer@apple.com>
+
+        Use OptionSet<DragDestinationAction> for mask values
+        <https://webkit.org/b/212115>
+        <rdar://problem/63423380>
+
+        Reviewed by Alex Christensen.
+
+        * WebCoreSupport/WebDragClient.mm:
+        (WebDragClient::willPerformDragDestinationAction):
+        * WebView/WebView.mm:
+        (-[WebView dragDataForSession:client:global:operation:]):
+        (-[WebView actionMaskForDraggingInfo:]):
+
 2020-05-26  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebDragClient.mm

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -87 +87 @@
 void WebDragClient::willPerformDragDestinationAction(WebCore::DragDestinationAction action, const WebCore::DragData& dragData)
 {
-    [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragDestinationAction:(WebDragDestinationAction)action forDraggingInfo:dragData.platformData()];
+    [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragDestinationAction:static_cast<WebDragDestinationAction>(action) forDraggingInfo:dragData.platformData()];
 }
 
@@ -215 +215 @@
 }
 
-void WebDragClient::willPerformDragDestinationAction(DragDestinationAction, const DragData&)
+void WebDragClient::willPerformDragDestinationAction(WebCore::DragDestinationAction, const DragData&)
 {
 }

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -1913 +1913 @@
 {
     auto dragOperationMask = static_cast<WebCore::DragOperation>(operation);
-    auto dragDestinationMask = static_cast<WebCore::DragDestinationAction>([self dragDestinationActionMaskForSession:session]);
+    auto dragDestinationMask = OptionSet<WebCore::DragDestinationAction>::fromRaw([self dragDestinationActionMaskForSession:session]);
     return { session, WebCore::roundedIntPoint(clientPosition), WebCore::roundedIntPoint(globalPosition), dragOperationMask, WebCore::DragApplicationNone, dragDestinationMask };
 }
@@ -6725 +6725 @@
 }
 
-- (WebCore::DragDestinationAction)actionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
-{
-    return (WebCore::DragDestinationAction)[[self _UIDelegateForwarder] webView:self dragDestinationActionMaskForDraggingInfo:draggingInfo];
+- (OptionSet<WebCore::DragDestinationAction>)actionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
+{
+    return OptionSet<WebCore::DragDestinationAction>::fromRaw([[self _UIDelegateForwarder] webView:self dragDestinationActionMaskForDraggingInfo:draggingInfo]);
 }