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

fix: memory leak in BrowserWindow (#27621)

Browse source
This commit is contained in:
Jeremy Rose 2021-02-05 13:20:20 -08:00 • committed by GitHub
parent b6a91ef5df
commit e87803919b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

20
shell/browser/electron_browser_main_parts.cc
View file

@ -231,14 +231,6 @@ int ElectronBrowserMainParts::GetExitCode() {
return exit_code_ != nullptr ? *exit_code_ : 0;
}
void ElectronBrowserMainParts::RegisterDestructionCallback(
base::OnceClosure callback) {
// The destructors should be called in reversed order, so dependencies between
// JavaScript objects can be correctly resolved.
// For example WebContentsView => WebContents => Session.
destructors_.insert(destructors_.begin(), std::move(callback));
}
int ElectronBrowserMainParts::PreEarlyInitialization() {
field_trial_list_ = std::make_unique<base::FieldTrialList>(nullptr);
#if defined(OS_LINUX)
@ -530,18 +522,6 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
}
}
// Make sure destruction callbacks are called before message loop is
// destroyed, otherwise some objects that need to be deleted on IO thread
// won't be freed.
// We don't use ranged for loop because iterators are getting invalided when
// the callback runs.
for (auto iter = destructors_.begin(); iter != destructors_.end();) {
base::OnceClosure callback = std::move(*iter);
if (!callback.is_null())
std::move(callback).Run();
++iter;
}
// Destroy node platform after all destructors_ are executed, as they may
// invoke Node/V8 APIs inside them.
node_env_->env()->set_trace_sync_io(false);

8
shell/browser/electron_browser_main_parts.h
View file

@ -75,11 +75,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
// Gets the exit code
int GetExitCode();
// Register a callback that should be destroyed before JavaScript environment
// gets destroyed.
// Returns a closure that can be used to remove |callback| from the list.
void RegisterDestructionCallback(base::OnceClosure callback);
// Returns the connection to GeolocationControl which can be
// used to enable the location services once per client.
device::mojom::GeolocationControl* GetGeolocationControl();
@ -162,9 +157,6 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<ElectronExtensionsBrowserClient> extensions_browser_client_;
#endif
// List of callbacks should be executed before destroying JS env.
std::list<base::OnceClosure> destructors_;
mojo::Remote<device::mojom::GeolocationControl> geolocation_control_;
static ElectronBrowserMainParts* self_;