mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 79.0.3945.1 (#706915)
This commit is contained in:
Daniel Nitsche
committed by
Marshall Greenblatt
Marshall Greenblatt
parent
b9fc93955c
commit
115f760821
@@ -1,16 +1,16 @@
|
||||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||
index 35302d90a73f..73424c925e13 100644
|
||||
index 2788029519d2..205d29075ff8 100644
|
||||
--- chrome/browser/net/profile_network_context_service.cc
|
||||
+++ chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "base/logging.h"
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "base/metrics/histogram_macros.h"
|
||||
#include "base/strings/string_split.h"
|
||||
#include "base/task/post_task.h"
|
||||
+#include "cef/libcef/features/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"
|
||||
@@ -463,9 +464,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
@@ -484,9 +485,22 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
network_context_params->cookie_manager_params =
|
||||
CreateCookieManagerParams(profile_, *cookie_settings_);
|
||||
|
||||
@@ -33,7 +33,7 @@ index 35302d90a73f..73424c925e13 100644
|
||||
PrefService* local_state = g_browser_process->local_state();
|
||||
// Configure the HTTP cache path and size.
|
||||
base::FilePath base_cache_path;
|
||||
@@ -478,6 +492,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
@@ -499,6 +513,7 @@ ProfileNetworkContextService::CreateNetworkContextParams(
|
||||
base_cache_path.Append(chrome::kCacheDirname);
|
||||
network_context_params->http_cache_max_size =
|
||||
local_state->GetInteger(prefs::kDiskCacheSize);
|
||||
@@ -42,10 +42,10 @@ index 35302d90a73f..73424c925e13 100644
|
||||
// Currently this just contains HttpServerProperties, but that will likely
|
||||
// change.
|
||||
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
|
||||
index 6a7b2e1c9c99..d119da2910fe 100644
|
||||
index 756fa14db62a..4fb52050f8a5 100644
|
||||
--- chrome/browser/profiles/profile.h
|
||||
+++ chrome/browser/profiles/profile.h
|
||||
@@ -373,6 +373,11 @@ class Profile : public content::BrowserContext {
|
||||
@@ -378,6 +378,11 @@ class Profile : public content::BrowserContext {
|
||||
virtual bool ShouldRestoreOldSessionCookies();
|
||||
virtual bool ShouldPersistSessionCookies();
|
||||
|
||||
@@ -56,12 +56,12 @@ index 6a7b2e1c9c99..d119da2910fe 100644
|
||||
+
|
||||
// Creates NetworkContext for the specified isolated app (or for the profile
|
||||
// itself, if |relative_path| is empty).
|
||||
virtual network::mojom::NetworkContextPtr CreateNetworkContext(
|
||||
virtual mojo::Remote<network::mojom::NetworkContext> CreateNetworkContext(
|
||||
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
|
||||
index d522c4d82094..f4979561fdf0 100644
|
||||
index adbda8bdf2c5..779e9e9764cb 100644
|
||||
--- net/cookies/cookie_monster.cc
|
||||
+++ net/cookies/cookie_monster.cc
|
||||
@@ -493,6 +493,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
@@ -504,6 +504,25 @@ void CookieMonster::SetCookieableSchemes(
|
||||
MaybeRunCookieCallback(std::move(callback), true);
|
||||
}
|
||||
|
||||
@@ -88,10 +88,10 @@ index d522c4d82094..f4979561fdf0 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 a0bd017e9c18..87f8ed8989d4 100644
|
||||
index 66ad270bb07e..ca9d9e073edf 100644
|
||||
--- net/cookies/cookie_monster.h
|
||||
+++ net/cookies/cookie_monster.h
|
||||
@@ -177,6 +177,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
@@ -180,6 +180,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
||||
CookieChangeDispatcher& GetChangeDispatcher() override;
|
||||
void SetCookieableSchemes(const std::vector<std::string>& schemes,
|
||||
SetCookieableSchemesCallback callback) override;
|
||||
@@ -101,12 +101,12 @@ index a0bd017e9c18..87f8ed8989d4 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 bcd72c1b56f7..67ff2c0edb32 100644
|
||||
index ebec5df3a7ed..718cf4bc7362 100644
|
||||
--- net/cookies/cookie_store.h
|
||||
+++ net/cookies/cookie_store.h
|
||||
@@ -127,6 +127,11 @@ class NET_EXPORT CookieStore {
|
||||
virtual void SetCookieableSchemes(const std::vector<std::string>& schemes,
|
||||
SetCookieableSchemesCallback callback) = 0;
|
||||
@@ -148,6 +148,11 @@ class NET_EXPORT CookieStore {
|
||||
// Transfer ownership of a CookieAccessDelegate.
|
||||
void SetCookieAccessDelegate(std::unique_ptr<CookieAccessDelegate> delegate);
|
||||
|
||||
+ // Adds to the list of cookieable schemes. Does nothing if called after first
|
||||
+ // use of the instance (i.e. after the instance initialization process).
|
||||
@@ -117,10 +117,10 @@ index bcd72c1b56f7..67ff2c0edb32 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 c0f105aec142..6afd5f9e25fc 100644
|
||||
index 5a087228a2f1..1f46f8de2ee8 100644
|
||||
--- services/network/cookie_manager.cc
|
||||
+++ services/network/cookie_manager.cc
|
||||
@@ -214,14 +214,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
@@ -219,14 +219,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
|
||||
void CookieManager::AllowFileSchemeCookies(
|
||||
bool allow,
|
||||
AllowFileSchemeCookiesCallback callback) {
|
||||
@@ -139,10 +139,10 @@ index c0f105aec142..6afd5f9e25fc 100644
|
||||
|
||||
void CookieManager::SetForceKeepSessionState() {
|
||||
diff --git services/network/network_context.cc services/network/network_context.cc
|
||||
index 8e848688225a..cbbf5de461d6 100644
|
||||
index 8489c08f3b5f..e2c22ea79382 100644
|
||||
--- services/network/network_context.cc
|
||||
+++ services/network/network_context.cc
|
||||
@@ -1762,6 +1762,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
@@ -1627,6 +1627,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
}
|
||||
|
||||
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
|
||||
@@ -150,7 +150,7 @@ index 8e848688225a..cbbf5de461d6 100644
|
||||
if (params_->cookie_path) {
|
||||
scoped_refptr<base::SequencedTaskRunner> client_task_runner =
|
||||
base::ThreadTaskRunnerHandle::Get();
|
||||
@@ -1789,18 +1790,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
@@ -1654,18 +1655,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
|
||||
session_cleanup_cookie_store =
|
||||
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);
|
||||
|
||||
@@ -182,10 +182,10 @@ index 8e848688225a..cbbf5de461d6 100644
|
||||
std::make_unique<net::StaticHttpUserAgentSettings>(
|
||||
params_->accept_language, params_->user_agent);
|
||||
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
|
||||
index 873bce449b63..3189e268d950 100644
|
||||
index 086f4b96cdd9..1fe8d2ccae88 100644
|
||||
--- services/network/public/mojom/network_context.mojom
|
||||
+++ services/network/public/mojom/network_context.mojom
|
||||
@@ -210,6 +210,9 @@ struct NetworkContextParams {
|
||||
@@ -225,6 +225,9 @@ struct NetworkContextParams {
|
||||
// cookies. Otherwise it should be false.
|
||||
bool persist_session_cookies = false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user