bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Normalize path values and add additional error logging (fixes issue #2405)

Browse Source 
This change also improves the settings documentation and enforces the
requirement that path values be absolute (see issue #2916).
This commit is contained in:
Marshall Greenblatt
2020-04-23 17:45:04 -04:00
parent 8ed39e4ae5
commit fd1f465fa7
7 changed files with 162 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libcef/browser/request_context_impl.cc
View File

@@ -645,9 +645,15 @@ void CefRequestContextImpl::Initialize() {
// Share storage with |config_.other|.
browser_context_ =
CefBrowserContext::GetForContext(config_.other->GetBrowserContext());
DCHECK(browser_context_);
}
if (!browser_context_) {
if (!config_.is_global) {
// User-specified settings need to be normalized.
CefContext::Get()->NormalizeRequestContextSettings(&config_.settings);
}
const base::FilePath& cache_path =
base::FilePath(CefString(&config_.settings.cache_path));
if (!cache_path.empty()) {
@@ -661,17 +667,17 @@ void CefRequestContextImpl::Initialize() {
// Create a new CefBrowserContext instance. If the cache path is non-
// empty then this new instance will become the globally registered
// CefBrowserContext for that path. Otherwise, this new instance will
// be a completely isolated "incongento mode" context.
// be a completely isolated "incognito mode" context.
browser_context_ = new CefBrowserContext(config_.settings);
browser_context_->Initialize();
} else {
// Share the same settings as the existing context.
config_.settings = browser_context_->GetSettings();
}
// We'll disassociate from |browser_context_| on destruction.
browser_context_->AddCefRequestContext(this);
// Force our settings to match |browser_context_|.
config_.settings = browser_context_->GetSettings();
if (config_.other) {
// Clear the reference to |config_.other| after setting
// |request_context_getter_|. This is the reverse order of checks in