Changeset 212476 in webkit

Timestamp:

Feb 16, 2017 3:31:42 PM (7 years ago)

Author:

andersca@apple.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (5 diffs)
• page/EventHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Anders Carlsson  <andersca@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  <achristensen@webkit.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3430 +3430 @@
 }
     
-void EventHandler::freeDataTransfer()
+void EventHandler::invalidateDataTransfer()
 {
     if (!dragState().dataTransfer)
@@ -3449 +3449 @@
         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
@@ -3565 +3565 @@
     
     // 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();
@@ -3581 +3581 @@
                 // the element in some way.  In this case we just kill the drag.
                 m_mouseDownMayStartDrag = false;
-                goto cleanupDrag;
+                invalidateDataTransfer();
+                dragState().source = nullptr;
+
+                return true;
             }
         } 
@@ -3619 +3622 @@
     } 
 
-cleanupDrag:
     if (!m_mouseDownMayStartDrag) {
         // Something failed to start the drag, clean up.
-        freeDataTransfer();
+        invalidateDataTransfer();
         dragState().source = nullptr;
     }

trunk/Source/WebCore/page/EventHandler.h

@@ -392 +392 @@
 #if ENABLE(DRAG_SUPPORT)
     bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer*);
-
-    void freeDataTransfer();
+    void invalidateDataTransfer();
 
     bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis);