mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 89.0.4389.0 (#843830)
- SSE3 is now required on x86 processors (see https://crbug.com/1123353).
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 ed1b0c3bad29..5ed2c290fd2b 100644
|
||||
index 0ccb74571b85..b4785ae3e875 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "base/strings/string_split.h"
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "base/task/post_task.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "cef/libcef/features/runtime.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"
|
||||
@@ -661,7 +662,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
@@ -682,7 +683,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 ed1b0c3bad29..5ed2c290fd2b 100644
|
||||
PrefService* local_state = g_browser_process->local_state();
|
||||
// Configure the HTTP cache path and size.
|
||||
base::FilePath base_cache_path;
|
||||
@@ -674,7 +687,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||
@@ -695,7 +708,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 ed1b0c3bad29..5ed2c290fd2b 100644
|
||||
// change.
|
||||
network_context_params->http_server_properties_path =
|
||||
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
||||
index 796d855211d9..5fac1444b3d5 100644
|
||||
index 9d5391e0c853..ebc6a10466fb 100644
|
||||
--- net/cookies/cookie_monster.cc
|
||||
+++ net/cookies/cookie_monster.cc
|
||||
@@ -469,6 +469,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
@@ -471,6 +471,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
MaybeRunCookieCallback(std::move(callback), true);
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ index 796d855211d9..5fac1444b3d5 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 2d45b2b113fd..fe0369aad18a 100644
|
||||
index 990869da1c30..22c047b1ea25 100644
|
||||
--- net/cookies/cookie_monster.h
|
||||
+++ net/cookies/cookie_monster.h
|
||||
@@ -184,6 +184,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
@@ -101,10 +101,10 @@ index 5ffbe648343d..3d9a0f2e828f 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 526ccf16da81..96ca62fbed3a 100644
|
||||
index f91ffe61dba5..f3482e68cd11 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -231,14 +231,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
@@ -230,14 +230,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
void CookieManager::AllowFileSchemeCookies(
|
||||
bool allow,
|
||||
AllowFileSchemeCookiesCallback callback) {
|
||||
@@ -123,10 +123,10 @@ index 526ccf16da81..96ca62fbed3a 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index 3773583bedd0..31157bbf388a 100644
|
||||
index a75980730046..a0c104d88545 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -1936,16 +1936,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -2014,16 +2014,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
network_service_->network_quality_estimator());
|
||||
}
|
||||
|
||||
@@ -157,10 +157,10 @@ index 3773583bedd0..31157bbf388a 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 0a09398cf50e..f7452357c1f4 100644
|
||||
index 294b04445bd3..f1f81e44986f 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -275,6 +275,9 @@ struct NetworkContextParams {
|
||||
@@ -288,6 +288,9 @@ struct NetworkContextParams {
|
||||
// cookies. Otherwise it should be false.
|
||||
bool persist_session_cookies = false;
|
||||
|
||||
|
Reference in New Issue
Block a user