mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
aa7a81deb9
Key fixes: - Replace `base::WeakPtrFactory` with `gin::WeakCellFactory` in MenuMac, MenuViews, and NetLog, since weak pointers to cppgc-managed objects must go through weak cells - Replace `v8::Global<v8::Value>` with `cppgc::Persistent<Menu>` for the menu reference in BaseWindow - Stop using `gin_helper::Handle<T>` with cppgc types; use raw `T*` and add a `static_assert` to prevent future misuse - Add proper `Trace()` overrides for Menu, MenuMac, MenuViews, and NetLog to ensure cppgc members are visited during garbage collection - Replace `SelfKeepAlive` prevent-GC mechanism in Menu with a `cppgc::Persistent` prevent-GC captured in `BindSelfToClosure` - Introduce `GC_PLUGIN_IGNORE` macro to suppress known-safe violations: mojo::Remote fields, ObjC bridging pointers, and intentional persistent self-references - Mark `ArgumentHolder` as `CPPGC_STACK_ALLOCATED()` in both Electron's and gin's function_template.h to silence raw-pointer-to-GC-type warnings
66 lines
1.8 KiB
Objective-C
66 lines
1.8 KiB
Objective-C
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_API_ELECTRON_API_MENU_MAC_H_
|
|
#define ELECTRON_SHELL_BROWSER_API_ELECTRON_API_MENU_MAC_H_
|
|
|
|
#include "shell/browser/api/electron_api_menu.h"
|
|
|
|
#include <map>
|
|
|
|
#include "gin/weak_cell.h"
|
|
#import "shell/browser/ui/cocoa/electron_menu_controller.h"
|
|
|
|
namespace electron {
|
|
class NativeWindow;
|
|
class WebFrameMain;
|
|
|
|
namespace api {
|
|
|
|
class MenuMac : public Menu {
|
|
public:
|
|
// Make public for cppgc::MakeGarbageCollected.
|
|
explicit MenuMac(gin::Arguments* args);
|
|
~MenuMac() override;
|
|
|
|
void Trace(cppgc::Visitor*) const override;
|
|
|
|
protected:
|
|
// Menu
|
|
void PopupAt(BaseWindow* window,
|
|
std::optional<WebFrameMain*> frame,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
ui::mojom::MenuSourceType source_type,
|
|
base::OnceClosure callback) override;
|
|
void PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
|
|
const base::WeakPtr<WebFrameMain>& frame,
|
|
int32_t window_id,
|
|
int x,
|
|
int y,
|
|
int positioning_item,
|
|
base::OnceClosure callback);
|
|
void ClosePopupAt(int32_t window_id) override;
|
|
std::u16string GetAcceleratorTextAtForTesting(int index) const override;
|
|
|
|
private:
|
|
friend class Menu;
|
|
|
|
void ClosePopupOnUI(int32_t window_id);
|
|
void OnClosed(int32_t window_id, base::OnceClosure callback);
|
|
|
|
ElectronMenuController* __strong menu_controller_;
|
|
|
|
// window ID -> open context menu
|
|
std::map<int32_t, ElectronMenuController*> popup_controllers_;
|
|
|
|
gin::WeakCellFactory<MenuMac> weak_cell_factory_{this};
|
|
};
|
|
|
|
} // namespace api
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_API_ELECTRON_API_MENU_MAC_H_
|