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

Update to Chromium version 94.0.4606.0 (#911515)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-08-19 19:40:49 -04:00
parent 955097ea77
commit 25c1947f1d
85 changed files with 745 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patch/patches/services_network_2622.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index bae294fef1f8b..06d2dfcecc956 100644
index 77573496f3548..2ac1f3ea101f9 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@@ -10,7 +10,7 @@ index bae294fef1f8b..06d2dfcecc956 100644
#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"
@@ -670,7 +671,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -673,7 +674,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes).
@@ -31,7 +31,7 @@ index bae294fef1f8b..06d2dfcecc956 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -683,7 +696,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -686,7 +699,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@@ -42,7 +42,7 @@ index bae294fef1f8b..06d2dfcecc956 100644
// change.
network_context_params->http_server_properties_path =
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index e2e1e9acb3605..f0b22ab2dce9d 100644
index f13f2ce613379..729c48c808342 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -506,6 +506,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -72,10 +72,10 @@ index e2e1e9acb3605..f0b22ab2dce9d 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 4b24d429aabb4..fbfa765aba86a 100644
index 8439ba30a162d..6170ffa6110ff 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -182,6 +182,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -181,6 +181,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
CookieChangeDispatcher& GetChangeDispatcher() override;
void SetCookieableSchemes(const std::vector<std::string>& schemes,
SetCookieableSchemesCallback callback) override;
@@ -85,10 +85,10 @@ index 4b24d429aabb4..fbfa765aba86a 100644
// Enables writing session cookies into the cookie database. If this this
// method is called, it must be called before first use of the instance
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
index afa99e255bdf1..5e8201696c613 100644
index 0642e632dedce..1e8be4703de44 100644
--- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h
@@ -156,6 +156,11 @@ class NET_EXPORT CookieStore {
@@ -155,6 +155,11 @@ class NET_EXPORT CookieStore {
// Transfer ownership of a CookieAccessDelegate.
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
@@ -123,10 +123,10 @@ index a397306372054..8a1bacea8d70c 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index a38eeaf6e58af..02ec2034afc8a 100644
index 7c64f63ad0661..fc7c495dedd62 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2052,16 +2052,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2054,16 +2054,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -157,10 +157,10 @@ index a38eeaf6e58af..02ec2034afc8a 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 25d6c99d4f6be..2c6cf5a907d16 100644
index 409b43c0bf005..fcc1a0a15a8f7 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -249,6 +249,9 @@ struct NetworkContextParams {
@@ -250,6 +250,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;