mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: raw_ptr destruction order in NodeBindings (#39762)

Browse source
This commit is contained in:
Charles Kerr 2023-09-07 18:25:17 -05:00 • committed by GitHub
parent 0b44f433c8
commit 792037b338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 69 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/renderer/electron_renderer_client.cc
View file

@ -27,10 +27,10 @@
namespace electron {
ElectronRendererClient::ElectronRendererClient()
: node_bindings_(
NodeBindings::Create(NodeBindings::BrowserEnvironment::kRenderer)),
electron_bindings_(
std::make_unique<ElectronBindings>(node_bindings_->uv_loop())) {}
: node_bindings_{NodeBindings::Create(
NodeBindings::BrowserEnvironment::kRenderer)},
electron_bindings_{
std::make_unique<ElectronBindings>(node_bindings_->uv_loop())} {}
ElectronRendererClient::~ElectronRendererClient() = default;

4
shell/renderer/electron_renderer_client.h
View file

@ -51,8 +51,8 @@ class ElectronRendererClient : public RendererClientBase {
// Whether the node integration has been initialized.
bool node_integration_initialized_ = false;
std::unique_ptr<NodeBindings> node_bindings_;
std::unique_ptr<ElectronBindings> electron_bindings_;
const std::unique_ptr<NodeBindings> node_bindings_;
const std::unique_ptr<ElectronBindings> electron_bindings_;
// The node::Environment::GetCurrent API does not return nullptr when it
// is called for a context without node::Environment, so we have to keep