Changeset 245355 in webkit

Timestamp:

May 15, 2019, 2:45:02 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r245196. rdar://problem/50753938

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):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@245196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch/Source/WebKit

Files:

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

branches/safari-607-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-14  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245196. rdar://problem/50753938
+
+    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):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245196 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-05-14  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -4125 +4125 @@
 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