Diff
Modified: trunk/Source/WebKit/ChangeLog (221769 => 221770)
--- trunk/Source/WebKit/ChangeLog 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/ChangeLog 2017-09-07 23:16:03 UTC (rev 221770)
@@ -1,3 +1,22 @@
+2017-09-07 Alex Christensen <achristen...@webkit.org>
+
+ 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:
+
2017-09-07 Myles C. Maxfield <mmaxfi...@apple.com>
[PAL] Unify PlatformUserPreferredLanguages.h with Language.h
Modified: trunk/Source/WebKit/Shared/DragControllerAction.h (221769 => 221770)
--- trunk/Source/WebKit/Shared/DragControllerAction.h 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/Shared/DragControllerAction.h 2017-09-07 23:16:03 UTC (rev 221770)
@@ -23,18 +23,29 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef DragControllerAction_h
-#define DragControllerAction_h
+#pragma once
namespace WebKit {
-enum DragControllerAction {
- DragControllerActionEntered,
- DragControllerActionUpdated,
- DragControllerActionExited,
- DragControllerActionPerformDragOperation
+enum class DragControllerAction {
+ Entered,
+ Updated,
+ Exited,
+ PerformDragOperation
};
} // namespace WebKit
-#endif // DragControllerAction_h
+namespace WTF {
+
+template<> struct EnumTraits<WebKit::DragControllerAction> {
+ using values = EnumValues<
+ WebKit::DragControllerAction,
+ WebKit::DragControllerAction::Entered,
+ WebKit::DragControllerAction::Updated,
+ WebKit::DragControllerAction::Exited,
+ WebKit::DragControllerAction::PerformDragOperation
+ >;
+};
+
+} // namespace WTF
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (221769 => 221770)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-07 23:16:03 UTC (rev 221770)
@@ -1709,7 +1709,7 @@
{
SandboxExtension::Handle sandboxExtensionHandle;
SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
- performDragControllerAction(DragControllerActionEntered, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
+ performDragControllerAction(DragControllerAction::Entered, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
}
void WebPageProxy::dragUpdated(DragData& dragData, const String& dragStorageName)
@@ -1716,7 +1716,7 @@
{
SandboxExtension::Handle sandboxExtensionHandle;
SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
- performDragControllerAction(DragControllerActionUpdated, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
+ performDragControllerAction(DragControllerAction::Updated, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
}
void WebPageProxy::dragExited(DragData& dragData, const String& dragStorageName)
@@ -1723,12 +1723,12 @@
{
SandboxExtension::Handle sandboxExtensionHandle;
SandboxExtension::HandleArray sandboxExtensionHandleEmptyArray;
- performDragControllerAction(DragControllerActionExited, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
+ performDragControllerAction(DragControllerAction::Exited, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionHandleEmptyArray);
}
void WebPageProxy::performDragOperation(DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
{
- performDragControllerAction(DragControllerActionPerformDragOperation, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
+ performDragControllerAction(DragControllerAction::PerformDragOperation, dragData, dragStorageName, sandboxExtensionHandle, sandboxExtensionsForUpload);
}
void WebPageProxy::performDragControllerAction(DragControllerAction action, DragData& dragData, const String& dragStorageName, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsForUpload)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (221769 => 221770)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-09-07 23:16:03 UTC (rev 221770)
@@ -3578,7 +3578,7 @@
#if ENABLE(DRAG_SUPPORT)
#if PLATFORM(GTK)
-void WebPage::performDragControllerAction(uint64_t action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
+void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&& selection, uint32_t flags)
{
if (!m_page) {
send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
@@ -3587,31 +3587,29 @@
DragData dragData(selection.selectionData.ptr(), clientPosition, globalPosition, static_cast<DragOperation>(draggingSourceOperationMask), static_cast<DragApplicationFlags>(flags));
switch (action) {
- case DragControllerActionEntered: {
+ case DragControllerAction::Entered: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
- break;
+ return;
}
- case DragControllerActionUpdated: {
+ case DragControllerAction::Updated: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), { }));
- break;
+ return;
}
- case DragControllerActionExited:
+ case DragControllerAction::Exited:
m_page->dragController().dragExited(dragData);
- break;
+ return;
- case DragControllerActionPerformDragOperation: {
+ case DragControllerAction::PerformDragOperation: {
m_page->dragController().performDragOperation(dragData);
- break;
+ return;
}
-
- default:
- ASSERT_NOT_REACHED();
}
+ ASSERT_NOT_REACHED();
}
#else
-void WebPage::performDragControllerAction(uint64_t action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
+void WebPage::performDragControllerAction(DragControllerAction action, const WebCore::DragData& dragData, const SandboxExtension::Handle& sandboxExtensionHandle, const SandboxExtension::HandleArray& sandboxExtensionsHandleArray)
{
if (!m_page) {
send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
@@ -3619,23 +3617,22 @@
}
switch (action) {
- case DragControllerActionEntered: {
+ case DragControllerAction::Entered: {
DragOperation resolvedDragOperation = m_page->dragController().dragEntered(dragData);
send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretRectInRootViewCoordinates()));
- break;
-
+ return;
}
- case DragControllerActionUpdated: {
+ case DragControllerAction::Updated: {
DragOperation resolvedDragOperation = m_page->dragController().dragUpdated(dragData);
send(Messages::WebPageProxy::DidPerformDragControllerAction(resolvedDragOperation, m_page->dragController().mouseIsOverFileInput(), m_page->dragController().numberOfItemsToBeAccepted(), m_page->dragCaretController().caretRectInRootViewCoordinates()));
- break;
+ return;
}
- case DragControllerActionExited:
+ case DragControllerAction::Exited:
m_page->dragController().dragExited(dragData);
send(Messages::WebPageProxy::DidPerformDragControllerAction(DragOperationNone, false, 0, { }));
- break;
+ return;
- case DragControllerActionPerformDragOperation: {
+ case DragControllerAction::PerformDragOperation: {
ASSERT(!m_pendingDropSandboxExtension);
m_pendingDropSandboxExtension = SandboxExtension::create(sandboxExtensionHandle);
@@ -3656,12 +3653,10 @@
#else
UNUSED_PARAM(handled);
#endif
- break;
+ return;
}
-
- default:
- ASSERT_NOT_REACHED();
}
+ ASSERT_NOT_REACHED();
}
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (221769 => 221770)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2017-09-07 23:16:03 UTC (rev 221770)
@@ -192,7 +192,6 @@
class WebUserContentController;
class VideoFullscreenManager;
class WebWheelEvent;
-enum FindOptions : uint16_t;
struct AssistedNodeInformation;
struct AttributedString;
struct BackForwardListItemState;
@@ -206,6 +205,9 @@
struct WebPreferencesStore;
struct WebSelectionData;
+enum class DragControllerAction;
+enum FindOptions : uint16_t;
+
typedef uint32_t SnapshotOptions;
typedef uint32_t WKEventModifiers;
@@ -734,9 +736,9 @@
#if ENABLE(DRAG_SUPPORT)
#if PLATFORM(GTK)
- void performDragControllerAction(uint64_t action, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&&, uint32_t flags);
+ void performDragControllerAction(DragControllerAction, const WebCore::IntPoint& clientPosition, const WebCore::IntPoint& globalPosition, uint64_t draggingSourceOperationMask, WebSelectionData&&, uint32_t flags);
#else
- void performDragControllerAction(uint64_t action, const WebCore::DragData&, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
+ void performDragControllerAction(DragControllerAction, const WebCore::DragData&, const SandboxExtension::Handle&, const SandboxExtension::HandleArray&);
#endif
void dragEnded(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t operation);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (221769 => 221770)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2017-09-07 23:13:38 UTC (rev 221769)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2017-09-07 23:16:03 UTC (rev 221770)
@@ -240,10 +240,10 @@
# Drag and drop.
#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
- PerformDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::WebSelectionData selection, uint32_t flags)
+ PerformDragControllerAction(enum WebKit::DragControllerAction action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, struct WebKit::WebSelectionData selection, uint32_t flags)
#endif
#if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
- PerformDragControllerAction(uint64_t action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
+ PerformDragControllerAction(enum WebKit::DragControllerAction action, WebCore::DragData dragData, WebKit::SandboxExtension::Handle sandboxExtensionHandle, WebKit::SandboxExtension::HandleArray sandboxExtensionsForUpload)
#endif
#if ENABLE(DRAG_SUPPORT)
DidStartDrag()
