Title: [212481] trunk/Source/WebCore
- Revision
- 212481
- Author
- [email protected]
- Date
- 2017-02-16 15:52:26 -0800 (Thu, 16 Feb 2017)
Log Message
Rename DataTransfer functions to indicate whether they are for dragging or dropping
https://bugs.webkit.org/show_bug.cgi?id=168478
Reviewed by Tim Horton.
* dom/DataTransfer.cpp:
(WebCore::DataTransfer::createForDrag):
(WebCore::DataTransfer::createForDrop):
(WebCore::DataTransfer::createForDragAndDrop): Deleted.
* dom/DataTransfer.h:
* page/DragController.cpp:
(WebCore::DragController::dragExited):
(WebCore::DragController::performDragOperation):
(WebCore::DragController::tryDHTMLDrag):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::createDraggingDataTransfer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (212480 => 212481)
--- trunk/Source/WebCore/ChangeLog 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/ChangeLog 2017-02-16 23:52:26 UTC (rev 212481)
@@ -1,5 +1,24 @@
2017-02-16 Anders Carlsson <[email protected]>
+ Rename DataTransfer functions to indicate whether they are for dragging or dropping
+ https://bugs.webkit.org/show_bug.cgi?id=168478
+
+ Reviewed by Tim Horton.
+
+ * dom/DataTransfer.cpp:
+ (WebCore::DataTransfer::createForDrag):
+ (WebCore::DataTransfer::createForDrop):
+ (WebCore::DataTransfer::createForDragAndDrop): Deleted.
+ * dom/DataTransfer.h:
+ * page/DragController.cpp:
+ (WebCore::DragController::dragExited):
+ (WebCore::DragController::performDragOperation):
+ (WebCore::DragController::tryDHTMLDrag):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+
+2017-02-16 Anders Carlsson <[email protected]>
+
Rename EventHandler::freeDataTransfer to invalidateDataTransfer
https://bugs.webkit.org/show_bug.cgi?id=168472
Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (212480 => 212481)
--- trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-16 23:52:26 UTC (rev 212481)
@@ -231,12 +231,12 @@
#else
-Ref<DataTransfer> DataTransfer::createForDragAndDrop()
+Ref<DataTransfer> DataTransfer::createForDrag()
{
return adoptRef(*new DataTransfer(DataTransferAccessPolicy::Writable, Pasteboard::createForDragAndDrop(), DragAndDrop));
}
-Ref<DataTransfer> DataTransfer::createForDragAndDrop(DataTransferAccessPolicy policy, const DragData& dragData)
+Ref<DataTransfer> DataTransfer::createForDrop(DataTransferAccessPolicy policy, const DragData& dragData)
{
return adoptRef(*new DataTransfer(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
}
Modified: trunk/Source/WebCore/dom/DataTransfer.h (212480 => 212481)
--- trunk/Source/WebCore/dom/DataTransfer.h 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/dom/DataTransfer.h 2017-02-16 23:52:26 UTC (rev 212481)
@@ -75,8 +75,8 @@
Pasteboard& pasteboard() { return *m_pasteboard; }
#if ENABLE(DRAG_SUPPORT)
- static Ref<DataTransfer> createForDragAndDrop();
- static Ref<DataTransfer> createForDragAndDrop(DataTransferAccessPolicy, const DragData&);
+ static Ref<DataTransfer> createForDrag();
+ static Ref<DataTransfer> createForDrop(DataTransferAccessPolicy, const DragData&);
bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
Modified: trunk/Source/WebCore/page/DragController.cpp (212480 => 212481)
--- trunk/Source/WebCore/page/DragController.cpp 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-16 23:52:26 UTC (rev 212481)
@@ -201,7 +201,7 @@
#else
DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
#endif
- auto dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
+ auto dataTransfer = DataTransfer::createForDrop(policy, dragData);
dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer);
dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
@@ -231,7 +231,7 @@
bool preventedDefault = false;
if (mainFrame->view()) {
// Sending an event can result in the destruction of the view and part.
- auto dataTransfer = DataTransfer::createForDragAndDrop(DataTransferAccessPolicy::Readable, dragData);
+ auto dataTransfer = DataTransfer::createForDrop(DataTransferAccessPolicy::Readable, dragData);
dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer);
dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
@@ -622,7 +622,7 @@
#else
DataTransferAccessPolicy policy = DataTransferAccessPolicy::TypesReadable;
#endif
- auto dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
+ auto dataTransfer = DataTransfer::createForDrop(policy, dragData);
DragOperation srcOpMask = dragData.draggingSourceOperationMask();
dataTransfer->setSourceOperation(srcOpMask);
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (212480 => 212481)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-16 23:48:50 UTC (rev 212480)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2017-02-16 23:52:26 UTC (rev 212481)
@@ -729,7 +729,7 @@
auto pasteboard = std::make_unique<Pasteboard>(NSDragPboard);
#pragma clang diagnostic pop
pasteboard->clear();
- return DataTransfer::createForDragAndDrop();
+ return DataTransfer::createForDrag();
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
