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 86.0.4240.0 (#800218)

Browse Source 
- CefURLRequest::Create is no longer supported in the renderer process
  (see https://crbug.com/891872). Use CefFrame::CreateURLRequest instead.
- Mac platform definitions have been changed from `MACOSX` to `MAC`
  (see https://crbug.com/1105907) and related CMake macro names have
  been updated. The old `OS_MACOSX` define is still set in code and CMake
  for backwards compatibility.
- Linux ARM build is currently broken (see https://crbug.com/1123214).
This commit is contained in:
Marshall Greenblatt
2020-08-28 18:39:23 -04:00
parent 6b1e5335bc
commit 24c2f2fa38
190 changed files with 1302 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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 b409f1bd146c..4536b21241e6 100644
index e5160aa3ff1a..87b037e517c2 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -19,6 +19,7 @@
@ -10,7 +10,7 @@ index b409f1bd146c..4536b21241e6 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"
@@ -723,9 +724,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -668,9 +669,23 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->cookie_manager_params =
CreateCookieManagerParams(profile_, *cookie_settings_);
@ -35,7 +35,7 @@ index b409f1bd146c..4536b21241e6 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -738,7 +753,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -683,7 +698,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize);
@ -46,12 +46,12 @@ index b409f1bd146c..4536b21241e6 100644
// change.
network_context_params->http_server_properties_path =
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
index 4e621c3366ab..0a8bdbc51f9c 100644
index a9dc5ed20a9f..3ce894531a21 100644
--- chrome/browser/profiles/profile.h
+++ chrome/browser/profiles/profile.h
@@ -447,6 +447,11 @@ class Profile : public content::BrowserContext {
virtual bool ShouldRestoreOldSessionCookies();
virtual bool ShouldPersistSessionCookies();
@@ -449,6 +449,11 @@ class Profile : public content::BrowserContext {
virtual bool ShouldRestoreOldSessionCookies() const;
virtual bool ShouldPersistSessionCookies() const;
+ // Returns schemes that should be cookieable, if other than the defaults.
+ virtual base::Optional<std::vector<std::string>> GetCookieableSchemes() {
@ -62,7 +62,7 @@ index 4e621c3366ab..0a8bdbc51f9c 100644
// specified isolated app (or for the profile itself, if |relative_path| is
// empty).
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 477b47a77211..1dca6b496350 100644
index 265deed0e52e..89d37ae6218a 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -479,6 +479,25 @@ void CookieMonster::SetCookieableSchemes(
@ -92,7 +92,7 @@ index 477b47a77211..1dca6b496350 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 9908e6f8e7ed..d85793db29de 100644
index 57ce9d640ac0..8c4cc927cf15 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -184,6 +184,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@ -105,7 +105,7 @@ index 9908e6f8e7ed..d85793db29de 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 47f2942cd329..b226df4c358a 100644
index 5ffbe648343d..3d9a0f2e828f 100644
--- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h
@@ -149,6 +149,11 @@ class NET_EXPORT CookieStore {
@ -143,10 +143,10 @@ index 1d988375b00a..e71cbc3b612f 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 3bb208bad23c..fd50ae357d3f 100644
index 5b4588fadf4b..1f685c4d6700 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -1809,6 +1809,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -1906,6 +1906,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
}
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
@ -154,7 +154,7 @@ index 3bb208bad23c..fd50ae357d3f 100644
if (params_->cookie_path) {
scoped_refptr<base::SequencedTaskRunner> client_task_runner =
base::ThreadTaskRunnerHandle::Get();
@@ -1835,18 +1836,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -1932,18 +1933,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
session_cleanup_cookie_store =
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);
@ -185,7 +185,7 @@ index 3bb208bad23c..fd50ae357d3f 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 6d5110add0e3..250175c0d05f 100644
index 87b26150440e..60c9eee375bb 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -274,6 +274,9 @@ struct NetworkContextParams {