Changeset 271206 in webkit

Timestamp:

Jan 6, 2021, 11:31:01 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Modernize WebContextMenu
​https://bugs.webkit.org/show_bug.cgi?id=219969

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-01-06
Reviewed by Tim Horton.

This is old code, complete with a raw pointer.
Use references instead of pointers where possible,
and WeakPtr instead of a raw pointer.

• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageClickMenuItem):
(WKBundlePageCopyContextMenuItems):

• WebProcess/WebCoreSupport/WebContextMenuClient.cpp:

(WebKit::WebContextMenuClient::showContextMenu):

• WebProcess/WebPage/WebContextMenu.cpp:

(WebKit::WebContextMenu::WebContextMenu):

• WebProcess/WebPage/WebContextMenu.h:

(WebKit::WebContextMenu::create):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::contextMenu):
(WebKit::WebPage::contextMenuAtPointInWindow):
(WebKit::handleContextMenuEvent):
(WebKit::WebPage::contextMenuForKeyEvent):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebContextMenuClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebContextMenu.cpp (modified) (1 diff)
• WebProcess/WebPage/WebContextMenu.h (modified) (5 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (4 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-06  Alex Christensen  <achristensen@webkit.org>
+
+        Modernize WebContextMenu
+        https://bugs.webkit.org/show_bug.cgi?id=219969
+
+        Reviewed by Tim Horton.
+
+        This is old code, complete with a raw pointer.
+        Use references instead of pointers where possible,
+        and WeakPtr instead of a raw pointer.
+
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageClickMenuItem):
+        (WKBundlePageCopyContextMenuItems):
+        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+        (WebKit::WebContextMenuClient::showContextMenu):
+        * WebProcess/WebPage/WebContextMenu.cpp:
+        (WebKit::WebContextMenu::WebContextMenu):
+        * WebProcess/WebPage/WebContextMenu.h:
+        (WebKit::WebContextMenu::create):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::contextMenu):
+        (WebKit::WebPage::contextMenuAtPointInWindow):
+        (WebKit::handleContextMenuEvent):
+        (WebKit::WebPage::contextMenuForKeyEvent):
+
 2021-01-06  Sihui Liu  <sihui_liu@appe.com>
 

trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

@@ -182 +182 @@
 {
 #if ENABLE(CONTEXT_MENUS)
-    WebKit::toImpl(pageRef)->contextMenu()->itemSelected(WebKit::toImpl(item)->data());
+    WebKit::toImpl(pageRef)->contextMenu().itemSelected(WebKit::toImpl(item)->data());
 #else
     UNUSED_PARAM(pageRef);
@@ -207 +207 @@
 {
 #if ENABLE(CONTEXT_MENUS)
-    WebKit::WebContextMenu* contextMenu = WebKit::toImpl(pageRef)->contextMenu();
-
-    return WebKit::toAPI(&contextMenuItems(*contextMenu).leakRef());
+    auto& contextMenu = WebKit::toImpl(pageRef)->contextMenu();
+
+    return WebKit::toAPI(&contextMenuItems(contextMenu).leakRef());
 #else
     UNUSED_PARAM(pageRef);

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

@@ -96 +96 @@
 void WebContextMenuClient::showContextMenu()
 {
-    m_page->contextMenu()->show();
+    m_page->contextMenu().show();
 }
 

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

@@ -41 +41 @@
 using namespace WebCore;
 
-WebContextMenu::WebContextMenu(WebPage* page)
-    : m_page(page)
+WebContextMenu::WebContextMenu(WebPage& page)
+    : m_page(makeWeakPtr(page))
 {
 }

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

@@ -19 +19 @@
  */
 
-#ifndef WebContextMenu_h
-#define WebContextMenu_h
+#pragma once
 
 #if ENABLE(CONTEXT_MENUS)
@@ -28 +27 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -40 +40 @@
 class WebContextMenu : public RefCounted<WebContextMenu> {
 public:
-    static Ref<WebContextMenu> create(WebPage* page) 
+    static Ref<WebContextMenu> create(WebPage& page)
     {
         return adoptRef(*new WebContextMenu(page));
@@ -52 +52 @@
 
 private:
-    WebContextMenu(WebPage*);
+    WebContextMenu(WebPage&);
     void menuItemsWithUserData(Vector<WebContextMenuItemData>&, RefPtr<API::Object>&) const;
 
-    WebPage* m_page;
+    WeakPtr<WebPage> m_page;
 };
 
@@ -61 +61 @@
 
 #endif // ENABLE(CONTEXT_MENUS)
-#endif // WebPopupMenu_h

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

@@ -2588 +2588 @@
 
 #if ENABLE(CONTEXT_MENUS)
-WebContextMenu* WebPage::contextMenu()
+WebContextMenu& WebPage::contextMenu()
 {
     if (!m_contextMenu)
-        m_contextMenu = WebContextMenu::create(this);
-    return m_contextMenu.get();
+        m_contextMenu = WebContextMenu::create(*this);
+    return *m_contextMenu;
 }
 
@@ -2603 +2603 @@
     corePage()->userInputBridge().handleMousePressEvent(mousePressEvent);
     bool handled = corePage()->userInputBridge().handleContextMenuEvent(mousePressEvent, corePage()->mainFrame());
-    auto* menu = handled ? contextMenu() : nullptr;
+    auto* menu = handled ? &contextMenu() : nullptr;
     PlatformMouseEvent mouseReleaseEvent(point, point, RightButton, PlatformEvent::MouseReleased, 1, false, false, false, false, WallTime::now(), WebCore::ForceAtClick, WebCore::NoTap);
     corePage()->userInputBridge().handleMouseReleaseEvent(mouseReleaseEvent);
@@ -2751 +2751 @@
 #if ENABLE(CONTEXT_MENUS)
     if (handled)
-        page->contextMenu()->show();
+        page->contextMenu().show();
 #endif
     return handled;
@@ -2766 +2766 @@
 #if ENABLE(CONTEXT_MENUS)
     if (handled)
-        contextMenu()->show();
+        contextMenu().show();
 #else
     UNUSED_PARAM(handled);

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -820 +820 @@
 
 #if ENABLE(CONTEXT_MENUS)
-    WebContextMenu* contextMenu();
+    WebContextMenu& contextMenu();
     WebContextMenu* contextMenuAtPointInWindow(const WebCore::IntPoint&);
 #endif