mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 82.0.4085.0 (#749737)
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
This commit is contained in:
@ -1,16 +1,16 @@
|
||||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||
index 75981a42a314..d29366145453 100644
|
||||
index 44ce8ba980a6..1dbbf0aa2341 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "base/strings/string_split.h"
|
||||
#include "base/task/post_task.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
+#include "cef/libcef/features/features.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/content_settings/cookie_settings_factory.h"
|
||||
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
||||
@@ -678,9 +679,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
@@ -681,9 +682,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
network_context_params->cookie_manager_params =
|
||||
CreateCookieManagerParams(profile_, *cookie_settings_);
|
||||
|
||||
@ -33,7 +33,7 @@ index 75981a42a314..d29366145453 100644
|
||||
PrefService* local_state = g_browser_process->local_state();
|
||||
// Configure the HTTP cache path and size.
|
||||
base::FilePath base_cache_path;
|
||||
@@ -693,6 +707,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
@@ -696,6 +710,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
base_cache_path.Append(chrome::kCacheDirname);
|
||||
network_context_params->http_cache_max_size =
|
||||
local_state->GetInteger(prefs::kDiskCacheSize);
|
||||
@ -42,10 +42,10 @@ index 75981a42a314..d29366145453 100644
|
||||
// Currently this just contains HttpServerProperties, but that will likely
|
||||
// change.
|
||||
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
||||
index 442d72296903..aec40aa4b77d 100644
|
||||
index ee2f1e1baf51..4d53c655d723 100644
|
||||
--- chrome/browser/profiles/profile.h
|
||||
+++ chrome/browser/profiles/profile.h
|
||||
@@ -380,6 +380,11 @@ class Profile : public content::BrowserContext {
|
||||
@@ -375,6 +375,11 @@ class Profile : public content::BrowserContext {
|
||||
virtual bool ShouldRestoreOldSessionCookies();
|
||||
virtual bool ShouldPersistSessionCookies();
|
||||
|
||||
@ -117,7 +117,7 @@ index 996ad7d14dfb..5c8e43c1d29c 100644
|
||||
virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
|
||||
const std::string& parent_absolute_name) const;
|
||||
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
||||
index 5dbc9d2dfcfb..1c31d97825c2 100644
|
||||
index d1bf7a4d1f6d..772e08ee8916 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -228,14 +228,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
@ -139,10 +139,10 @@ index 5dbc9d2dfcfb..1c31d97825c2 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index e5dfb9c6fd20..07578a987dd9 100644
|
||||
index 05bd6dc34b94..26bd748ad4b6 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -1765,6 +1765,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -1785,6 +1785,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
}
|
||||
|
||||
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
|
||||
@ -150,7 +150,7 @@ index e5dfb9c6fd20..07578a987dd9 100644
|
||||
if (params_->cookie_path) {
|
||||
scoped_refptr<base::SequencedTaskRunner> client_task_runner =
|
||||
base::ThreadTaskRunnerHandle::Get();
|
||||
@@ -1792,18 +1793,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -1811,18 +1812,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
session_cleanup_cookie_store =
|
||||
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);
|
||||
|
||||
@ -165,27 +165,26 @@ index e5dfb9c6fd20..07578a987dd9 100644
|
||||
} else {
|
||||
DCHECK(!params_->restore_old_session_cookies);
|
||||
DCHECK(!params_->persist_session_cookies);
|
||||
+
|
||||
+ cookie_store =
|
||||
+ std::make_unique<net::CookieMonster>(nullptr /* store */, net_log);
|
||||
}
|
||||
|
||||
+ }
|
||||
+
|
||||
+ if (params_->cookieable_schemes.has_value()) {
|
||||
+ cookie_store->SetCookieableSchemes(
|
||||
+ *params_->cookieable_schemes,
|
||||
+ net::CookieStore::SetCookieableSchemesCallback());
|
||||
+ }
|
||||
+
|
||||
}
|
||||
|
||||
+ builder.SetCookieStore(std::move(cookie_store));
|
||||
+
|
||||
std::unique_ptr<net::StaticHttpUserAgentSettings> user_agent_settings =
|
||||
std::make_unique<net::StaticHttpUserAgentSettings>(
|
||||
params_->accept_language, params_->user_agent);
|
||||
#if BUILDFLAG(IS_TRUST_TOKENS_SUPPORTED)
|
||||
if (base::FeatureList::IsEnabled(features::kTrustTokens)) {
|
||||
if (params_->trust_token_path) {
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index c37e71fb1eac..3504614682bb 100644
|
||||
index b74677de805c..b67a2d246e65 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -243,6 +243,9 @@ struct NetworkContextParams {
|
||||
@@ -253,6 +253,9 @@ struct NetworkContextParams {
|
||||
// cookies. Otherwise it should be false.
|
||||
bool persist_session_cookies = false;
|
||||
|
||||
|
Reference in New Issue
Block a user