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

fix: browser contexts live forever (#24964)

Browse source
This commit is contained in:
Jeremy Rose 2020-08-17 13:21:53 -07:00 • committed by GitHub
parent befbbc27d8
commit bac2f46ba9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 68 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

27
shell/browser/electron_browser_context.cc
View file

@ -10,6 +10,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/no_destructor.h"
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/task/post_task.h"
@ -91,15 +92,17 @@ std::string MakePartitionName(const std::string& input) {
} // namespace
// static
ElectronBrowserContext::BrowserContextMap
ElectronBrowserContext::browser_context_map_;
ElectronBrowserContext::BrowserContextMap&
ElectronBrowserContext::browser_context_map() {
static base::NoDestructor<ElectronBrowserContext::BrowserContextMap>
browser_context_map;
return *browser_context_map;
}
ElectronBrowserContext::ElectronBrowserContext(const std::string& partition,
bool in_memory,
base::DictionaryValue options)
: base::RefCountedDeleteOnSequence<ElectronBrowserContext>(
base::ThreadTaskRunnerHandle::Get()),
in_memory_pref_store_(nullptr),
: in_memory_pref_store_(nullptr),
storage_policy_(new SpecialStoragePolicy),
protocol_registry_(new ProtocolRegistry),
in_memory_(in_memory),
@ -444,19 +447,21 @@ ResolveProxyHelper* ElectronBrowserContext::GetResolveProxyHelper() {
}
// static
scoped_refptr<ElectronBrowserContext> ElectronBrowserContext::From(
ElectronBrowserContext* ElectronBrowserContext::From(
const std::string& partition,
bool in_memory,
base::DictionaryValue options) {
PartitionKey key(partition, in_memory);
auto* browser_context = browser_context_map_[key].get();
if (browser_context)
return scoped_refptr<ElectronBrowserContext>(browser_context);
ElectronBrowserContext* browser_context = browser_context_map()[key].get();
if (browser_context) {
return browser_context;
}
auto* new_context =
new ElectronBrowserContext(partition, in_memory, std::move(options));
browser_context_map_[key] = new_context->GetWeakPtr();
return scoped_refptr<ElectronBrowserContext>(new_context);
browser_context_map()[key] =
std::unique_ptr<ElectronBrowserContext>(new_context);
return new_context;
}
} // namespace electron