Changeset 221770 in webkit


Ignore:
Timestamp:
Sep 7, 2017 4:16:03 PM (7 years ago)
Author:
achristensen@apple.com
Message:

Make DragControllerAction an enum class
​https://bugs.webkit.org/show_bug.cgi?id=176565

Reviewed by Andy Estes.

  • Shared/DragControllerAction.h:

(): Deleted.

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::dragEntered):
(WebKit::WebPageProxy::dragUpdated):
(WebKit::WebPageProxy::dragExited):
(WebKit::WebPageProxy::performDragOperation):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::performDragControllerAction):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/WebPage/WebPage.messages.in:
Location:
trunk/Source/WebKit
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r221768 r221770  
     12017-09-07  Alex Christensen  <achristensen@webkit.org>
     2
     3        Make DragControllerAction an enum class
     4        https://bugs.webkit.org/show_bug.cgi?id=176565
     5
     6        Reviewed by Andy Estes.
     7
     8        * Shared/DragControllerAction.h:
     9        (): Deleted.
     10        * UIProcess/WebPageProxy.cpp:
     11        (WebKit::WebPageProxy::dragEntered):
     12        (WebKit::WebPageProxy::dragUpdated):
     13        (WebKit::WebPageProxy::dragExited):
     14        (WebKit::WebPageProxy::performDragOperation):
     15        * WebProcess/WebPage/WebPage.cpp:
     16        (WebKit::WebPage::performDragControllerAction):
     17        * WebProcess/WebPage/WebPage.h:
     18        * WebProcess/WebPage/WebPage.messages.in:
     19
    1202017-09-07  Myles C. Maxfield  <mmaxfield@apple.com>
    221

  • trunk/Source/WebKit/Shared/DragControllerAction.h

    r167040 r221770  
    2424 */
    2525
    26 #ifndef DragControllerAction_h
    27 #define DragControllerAction_h
     26#pragma once
    2827
    2928namespace WebKit {
    3029
    31 enum DragControllerAction {
    32     DragControllerActionEntered,
    33     DragControllerActionUpdated,
    34     DragControllerActionExited,
    35     DragControllerActionPerformDragOperation
     30enum class DragControllerAction {
     31    Entered,
     32    Updated,
     33    Exited,
     34    PerformDragOperation
    3635};
    3736
    3837} // namespace WebKit
    3938
    40 #endif // DragControllerAction_h
     39namespace WTF {
     40
     41template<> struct EnumTraits<WebKit::DragControllerAction> {
     42    using values = EnumValues<
     43        WebKit::DragControllerAction,
     44        WebKit::DragControllerAction::Entered,
     45        WebKit::DragControllerAction::Updated,
     46        WebKit::DragControllerAction::Exited,
     47        WebKit::DragControllerAction::PerformDragOperation
     48    >;
     49};
     50
     51} // namespace WTF

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r221766 r221770  
    17101710    SandboxExtension::Handle sandboxExtensionHandle;
    17111711    SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
    1712     performDragControllerAction(DragControllerActionEntered, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
     1712    performDragControllerAction(DragControllerAction::Entered, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
    17131713}
    17141714
    … …  
    17171717    SandboxExtension::Handle sandboxExtensionHandle;
    17181718    SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
    1719     performDragControllerAction(DragControllerActionUpdated, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
     1719    performDragControllerAction(DragControllerAction::Updated, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
    17201720}
    17211721
    … …  
    17241724    SandboxExtension::Handle sandboxExtensionHandle;
    17251725    SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
    1726     performDragControllerAction(DragControllerActionExited, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
     1726    performDragControllerAction(DragControllerAction::Exited, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
    17271727}
    17281728
    17291729void WebPageProxy::performDragOperation(DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
    17301730{
    1731     performDragControllerAction(DragControllerActionPerformDragOperation, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
     1731    performDragControllerAction(DragControllerAction::PerformDragOperation, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
    17321732}
    17331733

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r221743 r221770  
    35793579
    35803580#if PLATFORM(GTK)
    3581 void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
     3581void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
    35823582{
    35833583    if (!m_page) {
    … …  
    35883588    DragData dragData(selection.selectionData.ptr(), clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
    35893589    switch (action) {
    3590     case DragControllerActionEntered: {
     3590    case DragControllerAction::Entered: {
    35913591        DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
    35923592        send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
    3593         break;
    3594     }
    3595     case DragControllerActionUpdated: {
     3593        return;
     3594    }
     3595    case DragControllerAction::Updated: {
    35963596        DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
    35973597        send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
    3598         break;
    3599     }
    3600     case DragControllerActionExited:
     3598        return;
     3599    }
     3600    case DragControllerAction::Exited:
    36013601        m_page->dragController().dragExited(dragData);
    3602         break;
    3603 
    3604     case DragControllerActionPerformDragOperation: {
     3602        return;
     3603
     3604    case DragControllerAction::PerformDragOperation: {
    36053605        m_page->dragController().performDragOperation(dragData);
    3606         break;
    3607     }
    3608 
    3609     default:
    3610         ASSERT_NOT_REACHED();
    3611     }
     3606        return;
     3607    }
     3608    }
     3609    ASSERT_NOT_REACHED();
    36123610}
    36133611#else
    3614 void WebPage::performDragControllerAction(uint64_t action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
     3612void WebPage::performDragControllerAction(DragControllerAction action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
    36153613{
    36163614    if (!m_page) {
    … …  
    36203618
    36213619    switch (action) {
    3622     case DragControllerActionEntered: {
     3620    case DragControllerAction::Entered: {
    36233621        DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
    36243622        send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretRectInRootViewCoordinates()));
    3625         break;
    3626 
    3627     }
    3628     case DragControllerActionUpdated: {
     3623        return;
     3624    }
     3625    case DragControllerAction::Updated: {
    36293626        DragOperation resolvedDragOperation = m_page->dragController().dragUpdated(dragData);
    36303627        send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretRectInRootViewCoordinates()));
    3631         break;
    3632     }
    3633     case DragControllerActionExited:
     3628        return;
     3629    }
     3630    case DragControllerAction::Exited:
    36343631        m_page->dragController().dragExited(dragData);
    36353632        send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
    3636         break;
     3633        return;
    36373634       
    3638     case DragControllerActionPerformDragOperation: {
     3635    case DragControllerAction::PerformDragOperation: {
    36393636        ASSERT(!m_pendingDropSandboxExtension);
    36403637
    … …  
    36573654        UNUSED_PARAM(handled);
    36583655#endif
    3659         break;
    3660     }
    3661 
    3662     default:
    3663         ASSERT_NOT_REACHED();
    3664     }
     3656        return;
     3657    }
     3658    }
     3659    ASSERT_NOT_REACHED();
    36653660}
    36663661#endif

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r221660 r221770  
    193193class VideoFullscreenManager;
    194194class WebWheelEvent;
    195 enum FindOptions : uint16_t;
    196195struct AssistedNodeInformation;
    197196struct AttributedString;
    … …  
    206205struct WebPreferencesStore;
    207206struct WebSelectionData;
     207
     208enum class DragControllerAction;
     209enum FindOptions : uint16_t;
    208210
    209211typedef uint32_t SnapshotOptions;
    … …  
    735737#if ENABLE(DRAG_SUPPORT)
    736738#if PLATFORM(GTK)
    737     void performDragControllerAction(uint64_t action, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&&, uint32_t flags);
     739    void performDragControllerAction(DragControllerAction, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&&, uint32_t flags);
    738740#else
    739     void performDragControllerAction(uint64_t action, const WebCore::DragData&, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
     741    void performDragControllerAction(DragControllerAction, const WebCore::DragData&, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
    740742#endif
    741743    void dragEnded(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t operation);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r221660 r221770  
    241241    # Drag and drop.
    242242#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
    243     PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::WebSelectionData selection, uint32_t flags)
     243    PerformDragControllerAction(enum WebKit::DragControllerAction action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::WebSelectionData selection, uint32_t flags)
    244244#endif
    245245#if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
    246     PerformDragControllerAction(uint64_t action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
     246    PerformDragControllerAction(enum WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
    247247#endif
    248248#if ENABLE(DRAG_SUPPORT)
Note: See TracChangeset for help on using the changeset viewer.