mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.0 (#1427262)
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
||||
index 1dfbe67a3ec3c..6f0db67e6f929 100644
|
||||
index cd7ce8c483362..4e05ca9aa5896 100644
|
||||
--- net/cookies/cookie_monster.cc
|
||||
+++ net/cookies/cookie_monster.cc
|
||||
@@ -660,6 +660,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
@@ -681,6 +681,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
MaybeRunCookieCallback(std::move(callback), true);
|
||||
}
|
||||
|
||||
@ -29,10 +29,10 @@ index 1dfbe67a3ec3c..6f0db67e6f929 100644
|
||||
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
|
||||
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
||||
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
|
||||
index 1533aea31832c..ea961cbc9f65d 100644
|
||||
index 18fed025ee0b2..8d7ed64030ad1 100644
|
||||
--- net/cookies/cookie_monster.h
|
||||
+++ net/cookies/cookie_monster.h
|
||||
@@ -236,6 +236,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
@@ -239,6 +239,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
CookieChangeDispatcher& GetChangeDispatcher() override;
|
||||
void SetCookieableSchemes(const std::vector<std::string>& schemes,
|
||||
SetCookieableSchemesCallback callback) override;
|
||||
@ -42,10 +42,10 @@ index 1533aea31832c..ea961cbc9f65d 100644
|
||||
const net::SchemefulSite& site,
|
||||
const std::optional<CookiePartitionKey>& partition_key) const override;
|
||||
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
|
||||
index 3f0be99e0e145..0462ebbe9bedc 100644
|
||||
index 7c76c93f798b2..09f62ad48ccb4 100644
|
||||
--- net/cookies/cookie_store.h
|
||||
+++ net/cookies/cookie_store.h
|
||||
@@ -163,6 +163,11 @@ class NET_EXPORT CookieStore {
|
||||
@@ -171,6 +171,11 @@ class NET_EXPORT CookieStore {
|
||||
// Transfer ownership of a CookieAccessDelegate.
|
||||
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
|
||||
|
||||
@ -58,10 +58,10 @@ index 3f0be99e0e145..0462ebbe9bedc 100644
|
||||
// reset to null.
|
||||
const CookieAccessDelegate* cookie_access_delegate() const {
|
||||
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
|
||||
index 963ddd7d0fcce..81f37072b77fa 100644
|
||||
index 95f73bcb9fb40..e17a93f69c089 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -347,14 +347,9 @@ void CookieManager::AllowFileSchemeCookies(
|
||||
@@ -355,14 +355,9 @@ void CookieManager::AllowFileSchemeCookies(
|
||||
AllowFileSchemeCookiesCallback callback) {
|
||||
OnSettingsWillChange();
|
||||
|
||||
@ -80,45 +80,54 @@ index 963ddd7d0fcce..81f37072b77fa 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index e74079c81ddad..7fd92dc9434a3 100644
|
||||
index ca2df1e67d756..d2e963efdf1d8 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -2769,19 +2769,23 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -2785,22 +2785,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
pref_service.get(), network_service_->network_quality_estimator());
|
||||
}
|
||||
|
||||
- if (session_cleanup_cookie_store) {
|
||||
- // If the pref service was registered and initialized use it.
|
||||
- // If not, use nullptr to indicate prefs aren't available.
|
||||
- std::unique_ptr<net::CookieMonster> cookie_store =
|
||||
- std::make_unique<net::CookieMonster>(
|
||||
- session_cleanup_cookie_store.get(), net_log,
|
||||
- std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
|
||||
- pref_service.get()));
|
||||
- pref_service
|
||||
- ? std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
|
||||
- pref_service.get())
|
||||
- : nullptr);
|
||||
- if (params_->persist_session_cookies) {
|
||||
- cookie_store->SetPersistSessionCookies(true);
|
||||
- }
|
||||
-
|
||||
- builder.SetCookieStore(std::move(cookie_store));
|
||||
- }
|
||||
+ // If the pref service was registered and initialized use it.
|
||||
+ // If not, use nullptr to indicate prefs aren't available.
|
||||
+ std::unique_ptr<net::CookieMonster> cookie_store =
|
||||
+ std::make_unique<net::CookieMonster>(
|
||||
+ session_cleanup_cookie_store.get(), net_log,
|
||||
+ std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
|
||||
+ pref_service.get()));
|
||||
+ pref_service
|
||||
+ ? std::make_unique<KnownLegacyScopeDomainsPrefDelegate>(
|
||||
+ pref_service.get())
|
||||
+ : nullptr);
|
||||
+ if (session_cleanup_cookie_store && params_->persist_session_cookies) {
|
||||
+ cookie_store->SetPersistSessionCookies(true);
|
||||
+ }
|
||||
|
||||
- builder.SetCookieStore(std::move(cookie_store));
|
||||
+
|
||||
+ if (params_->cookieable_schemes.has_value()) {
|
||||
+ cookie_store->SetCookieableSchemes(
|
||||
+ *params_->cookieable_schemes,
|
||||
+ net::CookieStore::SetCookieableSchemesCallback());
|
||||
}
|
||||
|
||||
+ builder.SetCookieStore(std::move(cookie_store));
|
||||
+ }
|
||||
+
|
||||
+ builder.SetCookieStore(std::move(cookie_store));
|
||||
|
||||
base::FilePath transport_security_persister_file_name;
|
||||
if (GetFullDataFilePath(params_->file_paths,
|
||||
&network::mojom::NetworkContextFilePaths::
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index c292e1472c724..3b2237872fe20 100644
|
||||
index be45c88ba8571..536e92b4e9497 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -360,6 +360,9 @@ struct NetworkContextParams {
|
||||
|
Reference in New Issue
Block a user