Changeset 264016 in webkit

Timestamp:

Jul 7, 2020, 6:57:38 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r262680): [GTK] Crash in WebKit::DropTarget::didPerformAction
​https://bugs.webkit.org/show_bug.cgi?id=213885

Reviewed by Michael Catanzaro.

Just compare if new operation is the same as the current one, the == operator of Optional already takes care of
values being nullopt.

• UIProcess/API/gtk/DropTargetGtk3.cpp:

(WebKit::DropTarget::didPerformAction):

• UIProcess/API/gtk/DropTargetGtk4.cpp:

(WebKit::DropTarget::didPerformAction):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/DropTargetGtk3.cpp (modified) (1 diff)
• UIProcess/API/gtk/DropTargetGtk4.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r262680): [GTK] Crash in WebKit::DropTarget::didPerformAction
+        https://bugs.webkit.org/show_bug.cgi?id=213885
+
+        Reviewed by Michael Catanzaro.
+
+        Just compare if new operation is the same as the current one, the == operator of Optional already takes care of
+        values being nullopt.
+
+        * UIProcess/API/gtk/DropTargetGtk3.cpp:
+        (WebKit::DropTarget::didPerformAction):
+        * UIProcess/API/gtk/DropTargetGtk4.cpp:
+        (WebKit::DropTarget::didPerformAction):
+
 2020-07-07  Tomoki Imai  <Tomoki.Imai@sony.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk3.cpp

@@ -218 +218 @@
 
     auto operation = page->currentDragOperation();
-    if ((!operation && !m_operation) || *operation == *m_operation)
+    if (operation == m_operation)
         return;
 

trunk/Source/WebKit/UIProcess/API/gtk/DropTargetGtk4.cpp

@@ -274 +274 @@
 
     auto operation = page->currentDragOperation();
-    if ((!operation && !m_operation) || operation == m_operation)
+    if (operation == m_operation)
         return;