Title: [212476] trunk/Source/WebCore
- Revision
- 212476
- Author
- ander...@apple.com
- Date
- 2017-02-16 15:31:42 -0800 (Thu, 16 Feb 2017)
Log Message
Rename EventHandler::freeDataTransfer to invalidateDataTransfer
https://bugs.webkit.org/show_bug.cgi?id=168472
Reviewed by Tim Horton.
The code doesn't necessarily free the data transfer object, so rename the member function
to reflect that. Also, get rid of a goto.
* page/EventHandler.cpp:
(WebCore::EventHandler::invalidateDataTransfer):
(WebCore::EventHandler::dragSourceEndedAt):
(WebCore::EventHandler::handleDrag):
(WebCore::EventHandler::freeDataTransfer): Deleted.
* page/EventHandler.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (212475 => 212476)
--- trunk/Source/WebCore/ChangeLog 2017-02-16 23:26:53 UTC (rev 212475)
+++ trunk/Source/WebCore/ChangeLog 2017-02-16 23:31:42 UTC (rev 212476)
@@ -1,3 +1,20 @@
+2017-02-16 Anders Carlsson <ander...@apple.com>
+
+ Rename EventHandler::freeDataTransfer to invalidateDataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=168472
+
+ Reviewed by Tim Horton.
+
+ The code doesn't necessarily free the data transfer object, so rename the member function
+ to reflect that. Also, get rid of a goto.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::invalidateDataTransfer):
+ (WebCore::EventHandler::dragSourceEndedAt):
+ (WebCore::EventHandler::handleDrag):
+ (WebCore::EventHandler::freeDataTransfer): Deleted.
+ * page/EventHandler.h:
+
2017-02-16 Alex Christensen <achristen...@webkit.org>
Special URLs without a host are invalid
Modified: trunk/Source/WebCore/page/EventHandler.cpp (212475 => 212476)
--- trunk/Source/WebCore/page/EventHandler.cpp 2017-02-16 23:26:53 UTC (rev 212475)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2017-02-16 23:31:42 UTC (rev 212476)
@@ -3429,7 +3429,7 @@
return mouseMovementExceedsThreshold(dragViewportLocation, threshold);
}
-void EventHandler::freeDataTransfer()
+void EventHandler::invalidateDataTransfer()
{
if (!dragState().dataTransfer)
return;
@@ -3448,7 +3448,7 @@
// For now we don't care if event handler cancels default behavior, since there is no default behavior.
dispatchDragSrcEvent(eventNames().dragendEvent, event);
}
- freeDataTransfer();
+ invalidateDataTransfer();
dragState().source = nullptr;
// In case the drag was ended due to an escape key press we need to ensure
// that consecutive mousemove events don't reinitiate the drag and drop.
@@ -3564,7 +3564,7 @@
DragOperation srcOp = DragOperationNone;
// This does work only if we missed a dragEnd. Do it anyway, just to make sure the old dataTransfer gets numbed.
- freeDataTransfer();
+ invalidateDataTransfer();
dragState().dataTransfer = createDraggingDataTransfer();
@@ -3580,7 +3580,10 @@
// The renderer has disappeared, this can happen if the onStartDrag handler has hidden
// the element in some way. In this case we just kill the drag.
m_mouseDownMayStartDrag = false;
- goto cleanupDrag;
+ invalidateDataTransfer();
+ dragState().source = nullptr;
+
+ return true;
}
}
@@ -3618,10 +3621,9 @@
}
}
-cleanupDrag:
if (!m_mouseDownMayStartDrag) {
// Something failed to start the drag, clean up.
- freeDataTransfer();
+ invalidateDataTransfer();
dragState().source = nullptr;
}
Modified: trunk/Source/WebCore/page/EventHandler.h (212475 => 212476)
--- trunk/Source/WebCore/page/EventHandler.h 2017-02-16 23:26:53 UTC (rev 212475)
+++ trunk/Source/WebCore/page/EventHandler.h 2017-02-16 23:31:42 UTC (rev 212476)
@@ -391,9 +391,8 @@
#if ENABLE(DRAG_SUPPORT)
bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer*);
+ void invalidateDataTransfer();
- void freeDataTransfer();
-
bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
