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 103.0.5060.0 (#1002911)

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-05-19 13:28:44 +03:00
parent 7a372a642b
commit 185a908811
86 changed files with 522 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patch/patches/services_network_2622.patch
View File

@@ -1,16 +1,16 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 29db45d3f9b76..1df09e9ff6b0d 100644
index 7ac922c8fd84d..0f41d66ded494 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@
#include "base/task/thread_pool.h"
@@ -22,6 +22,7 @@
#include "base/trace_event/trace_event.h"
#include "build/build_config.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"
@@ -740,7 +741,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -741,7 +742,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 29db45d3f9b76..1df09e9ff6b0d 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -753,7 +766,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -754,7 +767,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 29db45d3f9b76..1df09e9ff6b0d 100644
::network::mojom::NetworkContextFilePaths::New();
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 73172c5c88463..9bce28bd24de8 100644
index 5f54517f7a690..19aec446150de 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -547,6 +547,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -101,7 +101,7 @@ index c143a7381df95..da14e2b0b1c81 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index c47a048291949..864c4e47ad4ca 100644
index 07c1fb882adc8..a1477e43e9ae4 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -368,14 +368,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -123,10 +123,10 @@ index c47a048291949..864c4e47ad4ca 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index ecc38d1584570..de23f7b820cdf 100644
index 812cfebfbe4f9..36579b8a53d06 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2361,17 +2361,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2362,17 +2362,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -134,13 +134,13 @@ index ecc38d1584570..de23f7b820cdf 100644
- std::unique_ptr<net::CookieMonster> cookie_store =
- std::make_unique<net::CookieMonster>(
- session_cleanup_cookie_store.get(), net_log,
- network_service_->first_party_sets()->is_enabled());
- network_service_->first_party_sets_manager()->is_enabled());
- if (params_->persist_session_cookies)
- cookie_store->SetPersistSessionCookies(true);
+ std::unique_ptr<net::CookieMonster> cookie_store =
+ std::make_unique<net::CookieMonster>(
+ session_cleanup_cookie_store.get(), net_log,
+ network_service_->first_party_sets()->is_enabled());
+ network_service_->first_party_sets_manager()->is_enabled());
+ if (session_cleanup_cookie_store && params_->persist_session_cookies)
+ cookie_store->SetPersistSessionCookies(true);
@@ -157,10 +157,10 @@ index ecc38d1584570..de23f7b820cdf 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 b2beaa762bfe8..8bb83610172b9 100644
index cc3f99007db46..8ef96d9b6effa 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -334,6 +334,9 @@ struct NetworkContextParams {
@@ -335,6 +335,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;