Changeset 245451 in webkit

Timestamp:

May 17, 2019, 4:25:06 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r245196 - Streamline test-and-clear operation for ContextMenu
​https://bugs.webkit.org/show_bug.cgi?id=197795
<rdar://problem/50473746>

Reviewed by Wenson Hsieh.

Rather than performing a check when entering the function, doing work,
then clearing the member variable, perform the check and clear in
a single operation. Only perform the selection if the menu exists.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didSelectItemFromActiveContextMenu):

Location:

releases/WebKitGTK/webkit-2.24/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-10  Brent Fulgham  <bfulgham@apple.com>
+
+        Streamline test-and-clear operation for ContextMenu
+        https://bugs.webkit.org/show_bug.cgi?id=197795
+        <rdar://problem/50473746>
+
+        Reviewed by Wenson Hsieh.
+
+        Rather than performing a check when entering the function, doing work,
+        then clearing the member variable, perform the check and clear in
+        a single operation. Only perform the selection if the menu exists.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didSelectItemFromActiveContextMenu):
+
 2019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -4137 +4137 @@
 void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItemData& item)
 {
-    if (!m_contextMenu)
-        return;
-
-    m_contextMenu->itemSelected(item);
-    m_contextMenu = nullptr;
+    if (auto contextMenu = std::exchange(m_contextMenu, nullptr))
+        contextMenu->itemSelected(item);
 }
 #endif