Changeset 255106 in webkit

Timestamp:

Jan 24, 2020 4:49:05 PM (4 years ago)

Author:

achristensen@apple.com

Message:

Update EditorState from WebProcess when requesting context menu
​https://bugs.webkit.org/show_bug.cgi?id=206775
<rdar://problem/56305573>

Reviewed by Wenson Hsieh.

When generating a context menu, AppKit calls -validRequestorForSendType:returnType:
which queries the editor state in WebViewImpl::validRequestorForSendAndReturnTypes.
Without updating the editor state, the first time you right click on a link,
the Services menu item did not appear because we were looking at a stale editor state.
Verified manually this fixes the bug.

• WebProcess/WebPage/WebContextMenu.cpp:

(WebKit::WebContextMenu::show):

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::handleSelectionServiceClick):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebContextMenu.cpp (modified) (1 diff)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-24  Alex Christensen  <achristensen@webkit.org>
+
+        Update EditorState from WebProcess when requesting context menu
+        https://bugs.webkit.org/show_bug.cgi?id=206775
+        <rdar://problem/56305573>
+
+        Reviewed by Wenson Hsieh.
+
+        When generating a context menu, AppKit calls -validRequestorForSendType:returnType:
+        which queries the editor state in WebViewImpl::validRequestorForSendAndReturnTypes.
+        Without updating the editor state, the first time you right click on a link,
+        the Services menu item did not appear because we were looking at a stale editor state.
+        Verified manually this fixes the bug.
+
+        * WebProcess/WebPage/WebContextMenu.cpp:
+        (WebKit::WebContextMenu::show):
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::handleSelectionServiceClick):
+
 2020-01-24  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebContextMenu.cpp

@@ -70 +70 @@
     // Mark the WebPage has having a shown context menu then notify the UIProcess.
     m_page->contextMenuShowing();
+    m_page->flushPendingEditorStateUpdate();
     m_page->send(Messages::WebPageProxy::ShowContextMenu(contextMenuContextData, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
 }

trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

@@ -833 +833 @@
     selectionDataVector.append(reinterpret_cast<const uint8_t*>(selectionData.bytes), selectionData.length);
 
+    flushPendingEditorStateUpdate();
     send(Messages::WebPageProxy::ShowContextMenu(ContextMenuContextData(point, selectionDataVector, phoneNumbers, selection.selection().isContentEditable()), UserData()));
 }