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 96.0.4664.0 (#929512)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
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 edbc03f9230de..cc0926c573325 100644
index a0b46c8619458..dee22b1fc7286 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
@ -7,10 +7,10 @@ index edbc03f9230de..cc0926c573325 100644
#include "base/task/thread_pool.h"
#include "build/chromeos_buildflags.h"
+#include "cef/libcef/features/runtime.h"
#include "chrome/browser/browser_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,7 +679,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -677,7 +678,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 edbc03f9230de..cc0926c573325 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -691,7 +704,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -690,7 +703,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@ -42,10 +42,10 @@ index edbc03f9230de..cc0926c573325 100644
::network::mojom::NetworkContextFilePaths::New();
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index b30a5ea775156..f381fe0540c93 100644
index 5c3c232d596d6..18e80cb883bc1 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -505,6 +505,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -509,6 +509,25 @@ void CookieMonster::SetCookieableSchemes(
MaybeRunCookieCallback(std::move(callback), true);
}
@ -72,10 +72,10 @@ index b30a5ea775156..f381fe0540c93 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 ad50ff33792ab..617c6d9061806 100644
index 5828ff23cdb25..d29e746701060 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -181,6 +181,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -203,6 +203,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 ad50ff33792ab..617c6d9061806 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 ea17ea39baead..9669ed0f908a7 100644
index 3a6c7c10d2638..1fd6811ab8e00 100644
--- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h
@@ -149,6 +149,11 @@ class NET_EXPORT CookieStore {
@@ -154,6 +154,11 @@ class NET_EXPORT CookieStore {
// Transfer ownership of a CookieAccessDelegate.
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
@ -101,10 +101,10 @@ index ea17ea39baead..9669ed0f908a7 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index a397306372054..8a1bacea8d70c 100644
index c09630b639542..a8b207b85a87e 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -253,14 +253,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
void CookieManager::AllowFileSchemeCookies(
bool allow,
AllowFileSchemeCookiesCallback callback) {
@ -123,10 +123,10 @@ index a397306372054..8a1bacea8d70c 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 188fe601bdf59..bfe5b8e921eb5 100644
index f8fddf1b0a2c7..35cac9272725a 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2141,16 +2141,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2144,16 +2144,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@ -157,10 +157,10 @@ index 188fe601bdf59..bfe5b8e921eb5 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 84b2e4eee90b1..0646b81a9235f 100644
index f3f625cc6d545..0c2a270cdad2c 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -298,6 +298,9 @@ struct NetworkContextParams {
@@ -311,6 +311,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;