<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[265756] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/265756">265756</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2020-08-17 09:33:54 -0700 (Mon, 17 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up DragApplicationFlags after switch to OptionSet<>
<https://webkit.org/b/215349>

Reviewed by Darin Adler.

Change WebCore::DragApplicationFlags to an enum class.

Source/WebCore:

No new tests since no change in behavior.

* page/gtk/DragControllerGtk.cpp:
(WebCore::DragController::isCopyKeyDown):
* page/mac/DragControllerMac.mm:
(WebCore::DragController::isCopyKeyDown):
(WebCore::DragController::dragOperation):
* platform/DragData.h:

Source/WebKit:

* UIProcess/API/gtk/DropTargetGtk3.cpp:
(WebKit::DropTarget::drop):
- Switch to use OptionSet<WebCore::DragApplicationFlags>.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::applicationFlagsForDrag):
* WebProcess/WebPage/WebPage.h:
- Update forward declaration.

Source/WebKitLegacy/mac:

* WebView/WebView.mm:
(-[WebView applicationFlags:]): Deleted.
(-[WebView _applicationFlagsForDrag:]):
- Rename -applicationFlags: to -_applicationFlagsForDrag: since
  it's only used internally.
- Switch to return OptionSet<WebCore::DragApplicationFlags>.
(-[WebView draggingEntered:]):
(-[WebView draggingUpdated:]):
(-[WebView draggingExited:]):
(-[WebView performDragOperation:]):
- Switch to calling -_applicationFlagsForDrag:.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagegtkDragControllerGtkcpp">trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacDragControllerMacmm">trunk/Source/WebCore/page/mac/DragControllerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformDragDatah">trunk/Source/WebCore/platform/DragData.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIgtkDropTargetGtk3cpp">trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebViewImplmm">trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacWebViewWebViewmm">trunk/Source/WebKitLegacy/mac/WebView/WebView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebCore/ChangeLog      2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2020-08-17  David Kilzer  <ddkilzer@apple.com>
+
+        Clean up DragApplicationFlags after switch to OptionSet<>
+        <https://webkit.org/b/215349>
+
+        Reviewed by Darin Adler.
+
+        Change WebCore::DragApplicationFlags to an enum class.
+
+        No new tests since no change in behavior.
+
+        * page/gtk/DragControllerGtk.cpp:
+        (WebCore::DragController::isCopyKeyDown):
+        * page/mac/DragControllerMac.mm:
+        (WebCore::DragController::isCopyKeyDown):
+        (WebCore::DragController::dragOperation):
+        * platform/DragData.h:
+
</ins><span class="cx"> 2020-08-17  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         JSDOMConstructorNotConstructable should be a constructor
</span></span></pre></div>
<a id="trunkSourceWebCorepagegtkDragControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp      2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool DragController::isCopyKeyDown(const DragData& dragData)
</span><span class="cx"> {
</span><del>-    return dragData.flags().contains(DragApplicationIsCopyKeyDown);
</del><ins>+    return dragData.flags().contains(DragApplicationFlags::IsCopyKeyDown);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Optional<DragOperation> DragController::dragOperation(const DragData& dragData)
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacDragControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/DragControllerMac.mm (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/DragControllerMac.mm       2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebCore/page/mac/DragControllerMac.mm  2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx"> 
</span><span class="cx"> bool DragController::isCopyKeyDown(const DragData& dragData)
</span><span class="cx"> {
</span><del>-    return dragData.flags().contains(DragApplicationIsCopyKeyDown);
</del><ins>+    return dragData.flags().contains(DragApplicationFlags::IsCopyKeyDown);
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> Optional<DragOperation> DragController::dragOperation(const DragData& dragData)
</span><span class="cx"> {
</span><del>-    if (dragData.flags().contains(DragApplicationIsModal))
</del><ins>+    if (dragData.flags().contains(DragApplicationFlags::IsModal))
</ins><span class="cx">         return WTF::nullopt;
</span><span class="cx"> 
</span><span class="cx">     bool mayContainURL;
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">     if (!mayContainURL && !dragData.containsPromise())
</span><span class="cx">         return WTF::nullopt;
</span><span class="cx"> 
</span><del>-    if (!m_documentUnderMouse || (!(dragData.flags().containsAll({ DragApplicationHasAttachedSheet, DragApplicationIsSource }))))
</del><ins>+    if (!m_documentUnderMouse || (!(dragData.flags().containsAll({ DragApplicationFlags::HasAttachedSheet, DragApplicationFlags::IsSource }))))
</ins><span class="cx">         return DragOperation::Copy;
</span><span class="cx"> 
</span><span class="cx">     return WTF::nullopt;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragData.h (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragData.h 2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebCore/platform/DragData.h    2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-enum DragApplicationFlags : uint8_t {
-    DragApplicationIsModal = 1,
-    DragApplicationIsSource = 2,
-    DragApplicationHasAttachedSheet = 4,
-    DragApplicationIsCopyKeyDown = 8
</del><ins>+enum class DragApplicationFlags : uint8_t {
+    IsModal = 1,
+    IsSource = 2,
+    HasAttachedSheet = 4,
+    IsCopyKeyDown = 8
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -148,10 +148,10 @@
</span><span class="cx"> template<> struct EnumTraits<WebCore::DragApplicationFlags> {
</span><span class="cx">     using values = EnumValues<
</span><span class="cx">         WebCore::DragApplicationFlags,
</span><del>-        WebCore::DragApplicationFlags::DragApplicationIsModal,
-        WebCore::DragApplicationFlags::DragApplicationIsSource,
-        WebCore::DragApplicationFlags::DragApplicationHasAttachedSheet,
-        WebCore::DragApplicationFlags::DragApplicationIsCopyKeyDown
</del><ins>+        WebCore::DragApplicationFlags::IsModal,
+        WebCore::DragApplicationFlags::IsSource,
+        WebCore::DragApplicationFlags::HasAttachedSheet,
+        WebCore::DragApplicationFlags::IsCopyKeyDown
</ins><span class="cx">     >;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKit/ChangeLog       2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2020-08-17  David Kilzer  <ddkilzer@apple.com>
+
+        Clean up DragApplicationFlags after switch to OptionSet<>
+        <https://webkit.org/b/215349>
+
+        Reviewed by Darin Adler.
+
+        Change WebCore::DragApplicationFlags to an enum class.
+
+        * UIProcess/API/gtk/DropTargetGtk3.cpp:
+        (WebKit::DropTarget::drop):
+        - Switch to use OptionSet<WebCore::DragApplicationFlags>.
+        * UIProcess/Cocoa/WebViewImpl.mm:
+        (WebKit::applicationFlagsForDrag):
+        * WebProcess/WebPage/WebPage.h:
+        - Update forward declaration.
+
</ins><span class="cx"> 2020-08-17  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] Remove support for NPAPI plugins
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIgtkDropTargetGtk3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp 2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp    2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -268,10 +268,10 @@
</span><span class="cx">     auto* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_webView));
</span><span class="cx">     ASSERT(page);
</span><span class="cx"> 
</span><del>-    uint32_t flags = 0;
</del><ins>+    OptionSet<DragApplicationFlags> flags;
</ins><span class="cx">     if (gdk_drag_context_get_selected_action(m_drop.get()) == GDK_ACTION_COPY)
</span><del>-        flags |= DragApplicationIsCopyKeyDown;
-    DragData dragData(&m_selectionData.value(), position, convertWidgetPointToScreenPoint(m_webView, position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(m_drop.get())), static_cast<DragApplicationFlags>(flags));
</del><ins>+        flags.add(DragApplicationFlags::IsCopyKeyDown);
+    DragData dragData(&m_selectionData.value(), position, convertWidgetPointToScreenPoint(m_webView, position), gdkDragActionToDragOperation(gdk_drag_context_get_actions(m_drop.get())), flags);
</ins><span class="cx">     page->performDragOperation(dragData, { }, { }, { });
</span><span class="cx">     gtk_drag_finish(m_drop.get(), TRUE, FALSE, time);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm       2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm  2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -3934,13 +3934,13 @@
</span><span class="cx">     ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
</span><span class="cx">     OptionSet<WebCore::DragApplicationFlags> flags;
</span><span class="cx">     if ([NSApp modalWindow])
</span><del>-        flags.add(WebCore::DragApplicationIsModal);
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsModal);
</ins><span class="cx">     if (view.window.attachedSheet)
</span><del>-        flags.add(WebCore::DragApplicationHasAttachedSheet);
</del><ins>+        flags.add(WebCore::DragApplicationFlags::HasAttachedSheet);
</ins><span class="cx">     if (draggingInfo.draggingSource == view)
</span><del>-        flags.add(WebCore::DragApplicationIsSource);
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsSource);
</ins><span class="cx">     if ([NSApp currentEvent].modifierFlags & NSEventModifierFlagOption)
</span><del>-        flags.add(WebCore::DragApplicationIsCopyKeyDown);
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsCopyKeyDown);
</ins><span class="cx">     return flags;
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx"> class TextCheckingRequest;
</span><span class="cx"> class VisiblePosition;
</span><span class="cx"> 
</span><del>-enum DragApplicationFlags : uint8_t;
</del><span class="cx"> enum SyntheticClickType : int8_t;
</span><span class="cx"> enum class DOMPasteAccessResponse : uint8_t;
</span><ins>+enum class DragApplicationFlags : uint8_t;
</ins><span class="cx"> enum class DragHandlingMethod : uint8_t;
</span><span class="cx"> enum class EventMakesGamepadsVisible : bool;
</span><span class="cx"> enum class SelectionDirection : uint8_t;
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2020-08-17  David Kilzer  <ddkilzer@apple.com>
+
+        Clean up DragApplicationFlags after switch to OptionSet<>
+        <https://webkit.org/b/215349>
+
+        Reviewed by Darin Adler.
+
+        Change WebCore::DragApplicationFlags to an enum class.
+
+        * WebView/WebView.mm:
+        (-[WebView applicationFlags:]): Deleted.
+        (-[WebView _applicationFlagsForDrag:]):
+        - Rename -applicationFlags: to -_applicationFlagsForDrag: since
+          it's only used internally.
+        - Switch to return OptionSet<WebCore::DragApplicationFlags>.
+        (-[WebView draggingEntered:]):
+        (-[WebView draggingUpdated:]):
+        (-[WebView draggingExited:]):
+        (-[WebView performDragOperation:]):
+        - Switch to calling -_applicationFlagsForDrag:.
+
</ins><span class="cx"> 2020-08-12  Keith Rollin  <krollin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove the need for defining USE_NEW_BUILD_SYSTEM
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (265755 => 265756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-08-17 14:06:16 UTC (rev 265755)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm    2020-08-17 16:33:54 UTC (rev 265756)
</span><span class="lines">@@ -6876,18 +6876,18 @@
</span><span class="cx">     return [documentView _shouldAutoscrollForDraggingInfo:draggingInfo];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (WebCore::DragApplicationFlags)applicationFlags:(id <NSDraggingInfo>)draggingInfo
</del><ins>+- (OptionSet<WebCore::DragApplicationFlags>)_applicationFlagsForDrag:(id <NSDraggingInfo>)draggingInfo
</ins><span class="cx"> {
</span><del>-    uint32_t flags = 0;
</del><ins>+    OptionSet<WebCore::DragApplicationFlags> flags;
</ins><span class="cx">     if ([NSApp modalWindow])
</span><del>-        flags = WebCore::DragApplicationIsModal;
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsModal);
</ins><span class="cx">     if ([[self window] attachedSheet])
</span><del>-        flags |= WebCore::DragApplicationHasAttachedSheet;
</del><ins>+        flags.add(WebCore::DragApplicationFlags::HasAttachedSheet);
</ins><span class="cx">     if ([draggingInfo draggingSource] == self)
</span><del>-        flags |= WebCore::DragApplicationIsSource;
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsSource);
</ins><span class="cx">     if ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagOption)
</span><del>-        flags |= WebCore::DragApplicationIsCopyKeyDown;
-    return static_cast<WebCore::DragApplicationFlags>(flags);
</del><ins>+        flags.add(WebCore::DragApplicationFlags::IsCopyKeyDown);
+    return flags;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (OptionSet<WebCore::DragDestinationAction>)actionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
</span><span class="lines">@@ -6900,7 +6900,7 @@
</span><span class="cx">     WebCore::IntPoint client([draggingInfo draggingLocation]);
</span><span class="cx">     WebCore::IntPoint global(WebCore::globalPoint([draggingInfo draggingLocation], [self window]));
</span><span class="cx"> 
</span><del>-    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo], [self actionMaskForDraggingInfo:draggingInfo]);
</del><ins>+    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self _applicationFlagsForDrag:draggingInfo], [self actionMaskForDraggingInfo:draggingInfo]);
</ins><span class="cx">     return kit(core(self)->dragController().dragEntered(dragData));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -6913,7 +6913,7 @@
</span><span class="cx">     WebCore::IntPoint client([draggingInfo draggingLocation]);
</span><span class="cx">     WebCore::IntPoint global(WebCore::globalPoint([draggingInfo draggingLocation], [self window]));
</span><span class="cx"> 
</span><del>-    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo], [self actionMaskForDraggingInfo:draggingInfo]);
</del><ins>+    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self _applicationFlagsForDrag:draggingInfo], [self actionMaskForDraggingInfo:draggingInfo]);
</ins><span class="cx">     return kit(page->dragController().dragUpdated(dragData));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -6925,7 +6925,7 @@
</span><span class="cx"> 
</span><span class="cx">     WebCore::IntPoint client([draggingInfo draggingLocation]);
</span><span class="cx">     WebCore::IntPoint global(WebCore::globalPoint([draggingInfo draggingLocation], [self window]));
</span><del>-    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
</del><ins>+    WebCore::DragData dragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self _applicationFlagsForDrag:draggingInfo]);
</ins><span class="cx">     page->dragController().dragExited(dragData);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -6938,7 +6938,7 @@
</span><span class="cx"> {
</span><span class="cx">     WebCore::IntPoint client([draggingInfo draggingLocation]);
</span><span class="cx">     WebCore::IntPoint global(WebCore::globalPoint([draggingInfo draggingLocation], [self window]));
</span><del>-    auto* dragData = new WebCore::DragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self applicationFlags:draggingInfo]);
</del><ins>+    auto* dragData = new WebCore::DragData(draggingInfo, client, global, coreDragOperationMask([draggingInfo draggingSourceOperationMask]), [self _applicationFlagsForDrag:draggingInfo]);
</ins><span class="cx"> 
</span><span class="cx">     NSArray* types = draggingInfo.draggingPasteboard.types;
</span><span class="cx">     if (![types containsObject:WebArchivePboardType] && [types containsObject:WebCore::legacyFilesPromisePasteboardType()]) {
</span></span></pre>
</div>
</div>

</body>
</html>