bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 106.0.5249.61

This commit is contained in:
Marshall Greenblatt 2022-09-29 12:50:03 +00:00 committed by Marshall Greenblatt
parent cbdc66c0ab
commit 1389ac0dcd
9 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/106.0.5249.12', 'chromium_checkout': 'refs/tags/106.0.5249.61',
'depot_tools_checkout': 'b7ec673ccc' 'depot_tools_checkout': 'b7ec673ccc'
} }

2
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn diff --git base/BUILD.gn base/BUILD.gn
index 20e49fa40d823..9e18a2b2dc6c0 100644 index fb175ca07c990..8de7a5e978628 100644
--- base/BUILD.gn --- base/BUILD.gn
+++ base/BUILD.gn +++ base/BUILD.gn
@@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -37,6 +37,7 @@ import("//build/nocompile.gni")

10
patch/patches/chrome_browser_context_menus.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 693145325ca59..0ecb5bcb7d146 100644 index 039a9e48ea396..35d1bf88b1868 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@ -42,7 +42,7 @@ index 693145325ca59..0ecb5bcb7d146 100644
} }
RenderViewContextMenu::~RenderViewContextMenu() = default; RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1148,6 +1167,12 @@ void RenderViewContextMenu::InitMenu() { @@ -1154,6 +1173,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause // menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669). // it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems(); AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index 693145325ca59..0ecb5bcb7d146 100644
} }
Profile* RenderViewContextMenu::GetProfile() const { Profile* RenderViewContextMenu::GetProfile() const {
@@ -2998,6 +3023,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( @@ -3002,6 +3027,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb); execute_plugin_action_callback_ = std::move(cb);
} }
@ -69,7 +69,7 @@ index 693145325ca59..0ecb5bcb7d146 100644
RenderViewContextMenu::GetHandlersForLinkUrl() { RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index ff9baacda8bc9..a57966a287530 100644 index 81be89d1a76c0..347d6f2beb516 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h --- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -127,6 +127,12 @@ class RenderViewContextMenu @@ -127,6 +127,12 @@ class RenderViewContextMenu
@ -85,7 +85,7 @@ index ff9baacda8bc9..a57966a287530 100644
protected: protected:
Profile* GetProfile() const; Profile* GetProfile() const;
@@ -353,6 +359,9 @@ class RenderViewContextMenu @@ -355,6 +361,9 @@ class RenderViewContextMenu
// built. // built.
bool is_protocol_submenu_valid_ = false; bool is_protocol_submenu_valid_ = false;

8
patch/patches/chrome_plugins.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
index 22e8a17b5e2cc..859cd6712debe 100644 index 3ea8226ff2136..fb65544a82911 100644
--- chrome/browser/plugins/plugin_info_host_impl.cc --- chrome/browser/plugins/plugin_info_host_impl.cc
+++ chrome/browser/plugins/plugin_info_host_impl.cc +++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
@ -10,7 +10,7 @@ index 22e8a17b5e2cc..859cd6712debe 100644
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -51,6 +52,10 @@ @@ -52,6 +53,10 @@
#include "url/gurl.h" #include "url/gurl.h"
#include "url/origin.h" #include "url/origin.h"
@ -21,7 +21,7 @@ index 22e8a17b5e2cc..859cd6712debe 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "components/guest_view/browser/guest_view_base.h" #include "components/guest_view/browser/guest_view_base.h"
#include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry.h"
@@ -100,6 +105,9 @@ bool IsPluginLoadingAccessibleResourceInWebView( @@ -101,6 +106,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
extensions::ExtensionRegistry* extension_registry, extensions::ExtensionRegistry* extension_registry,
int process_id, int process_id,
const GURL& resource) { const GURL& resource) {
@ -31,7 +31,7 @@ index 22e8a17b5e2cc..859cd6712debe 100644
extensions::WebViewRendererState* renderer_state = extensions::WebViewRendererState* renderer_state =
extensions::WebViewRendererState::GetInstance(); extensions::WebViewRendererState::GetInstance();
std::string partition_id; std::string partition_id;
@@ -128,14 +136,18 @@ bool IsPluginLoadingAccessibleResourceInWebView( @@ -129,14 +137,18 @@ bool IsPluginLoadingAccessibleResourceInWebView(
PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile) PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
: render_process_id_(render_process_id), : render_process_id_(render_process_id),

10
patch/patches/chrome_runtime.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 3799b4be80f5a..9b6714ca31df3 100644 index c698f4dabbabf..c142f146284fa 100644
--- chrome/app/chrome_main_delegate.cc --- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
@ -174,7 +174,7 @@ index 7ef669d52b306..8edc1aaeaff6a 100644
+#endif +#endif
} }
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 8ef1248e59485..d08d2be6be6e1 100644 index 0b6592cfa2e86..462f5278e70e3 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@ -269,7 +269,7 @@ index 8ef1248e59485..d08d2be6be6e1 100644
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 32e6ff58ca147..d1e8f6a107924 100644 index 29893348cd1ed..6d9e16ba37815 100644
--- chrome/browser/chrome_content_browser_client.h --- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h
@@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -118,6 +118,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@ -281,7 +281,7 @@ index 32e6ff58ca147..d1e8f6a107924 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out // TODO(https://crbug.com/787567): This file is about calls from content/ out
// to chrome/ to get values or notify about events, but both of these // to chrome/ to get values or notify about events, but both of these
// functions are from chrome/ to chrome/ and don't involve content/ at all. // functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -586,7 +588,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -589,7 +591,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override; override;
void OnNetworkServiceCreated( void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override; network::mojom::NetworkService* network_service) override;
@ -290,7 +290,7 @@ index 32e6ff58ca147..d1e8f6a107924 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -928,7 +930,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -931,7 +933,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID) #if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0; uint64_t num_keepalive_requests_ = 0;

22
patch/patches/chrome_runtime_views.patch
View File

@ -189,7 +189,7 @@ index 9bd586697dece..80ef1f08cb463 100644
BrowserFrame(const BrowserFrame&) = delete; BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(const BrowserFrame&) = delete; BrowserFrame& operator=(const BrowserFrame&) = delete;
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index f19af5dd5c46e..37827cab73cf8 100644 index 167e7d5a1ce24..c77fbe1e82179 100644
--- chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -307,11 +307,10 @@ using content::NativeWebKeyboardEvent; @@ -307,11 +307,10 @@ using content::NativeWebKeyboardEvent;
@ -257,7 +257,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
contents_separator_ = contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>()); top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1813,6 +1829,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { @@ -1819,6 +1835,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled()) if (immersive_mode_controller_->IsEnabled())
return false; return false;
@ -266,7 +266,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
} }
@@ -3129,7 +3147,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { @@ -3135,7 +3153,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this) if (top_container()->parent() == this)
return; return;
@ -276,7 +276,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -3670,8 +3689,10 @@ void BrowserView::Layout() { @@ -3676,8 +3695,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code? // TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -289,7 +289,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
// Some of the situations when the BrowserView is laid out are: // Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode. // - Enter/exit immersive fullscreen mode.
@@ -3737,6 +3758,11 @@ void BrowserView::AddedToWidget() { @@ -3743,6 +3764,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@ -301,7 +301,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button // TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3798,13 +3824,9 @@ void BrowserView::AddedToWidget() { @@ -3804,13 +3830,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();
@ -317,7 +317,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
using_native_frame_ = frame_->ShouldUseNativeFrame(); using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
@@ -4221,7 +4243,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, @@ -4228,7 +4250,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout. // Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false; in_process_fullscreen_ = false;
ToolbarSizeChanged(false); ToolbarSizeChanged(false);
@ -327,7 +327,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
} }
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4549,6 +4572,8 @@ Profile* BrowserView::GetProfile() { @@ -4556,6 +4579,8 @@ Profile* BrowserView::GetProfile() {
} }
void BrowserView::UpdateUIForTabFullscreen() { void BrowserView::UpdateUIForTabFullscreen() {
@ -336,7 +336,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
frame()->GetFrameView()->UpdateFullscreenTopUI(); frame()->GetFrameView()->UpdateFullscreenTopUI();
} }
@@ -4571,6 +4596,8 @@ void BrowserView::HideDownloadShelf() { @@ -4578,6 +4603,8 @@ void BrowserView::HideDownloadShelf() {
} }
bool BrowserView::CanUserExitFullscreen() const { bool BrowserView::CanUserExitFullscreen() const {
@ -346,7 +346,7 @@ index f19af5dd5c46e..37827cab73cf8 100644
} }
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 2e054124298d4..8df50230cfaba 100644 index 2d72b3a0eec68..202cad158b797 100644
--- chrome/browser/ui/views/frame/browser_view.h --- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h
@@ -126,11 +126,16 @@ class BrowserView : public BrowserWindow, @@ -126,11 +126,16 @@ class BrowserView : public BrowserWindow,
@ -366,7 +366,7 @@ index 2e054124298d4..8df50230cfaba 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; } void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; } BrowserFrame* frame() const { return frame_; }
@@ -762,6 +767,12 @@ class BrowserView : public BrowserWindow, @@ -763,6 +768,12 @@ class BrowserView : public BrowserWindow,
// aligned side panels. // aligned side panels.
void RightAlignedSidePanelWasClosed(); void RightAlignedSidePanelWasClosed();

2
patch/patches/content_2015.patch
View File

@ -12,7 +12,7 @@ index f0961360fe885..1b5103cca7df6 100644
GetContentClient()->browser()->GetUserAgent()); GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING); version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 4f8967e57bbc3..281af1ce0c1cd 100644 index 033c273833cda..15b3f8d05bf2f 100644
--- content/browser/loader/navigation_url_loader_impl.cc --- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -718,6 +718,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( @@ -718,6 +718,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(

22
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 diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 417aee498f300..19f4d5b34c4c7 100644 index fd69772bc3c48..43942fab7ed54 100644
--- chrome/browser/net/profile_network_context_service.cc --- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -9,8 +9,8 @@ index 417aee498f300..19f4d5b34c4c7 100644
+#include "cef/libcef/features/runtime.h" +#include "cef/libcef/features/runtime.h"
#include "chrome/browser/browser_features.h" #include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/chrome_content_browser_client.h"
@@ -758,7 +759,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( @@ -788,7 +789,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
// Configure on-disk storage for non-OTR profiles. OTR profiles just use // Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes). // default behavior (in memory storage, default sizes).
@ -31,7 +31,7 @@ index 417aee498f300..19f4d5b34c4c7 100644
PrefService* local_state = g_browser_process->local_state(); PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size. // Configure the HTTP cache path and size.
base::FilePath base_cache_path; base::FilePath base_cache_path;
@@ -771,7 +784,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( @@ -801,7 +814,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
base_cache_path.Append(chrome::kCacheDirname); base_cache_path.Append(chrome::kCacheDirname);
network_context_params->http_cache_max_size = network_context_params->http_cache_max_size =
local_state->GetInteger(prefs::kDiskCacheSize); local_state->GetInteger(prefs::kDiskCacheSize);
@ -42,10 +42,10 @@ index 417aee498f300..19f4d5b34c4c7 100644
::network::mojom::NetworkContextFilePaths::New(); ::network::mojom::NetworkContextFilePaths::New();
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index c433232365c93..60e149bafcf68 100644 index 937e61e26632d..26b4f6691fd3d 100644
--- net/cookies/cookie_monster.cc --- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc
@@ -542,6 +542,25 @@ void CookieMonster::SetCookieableSchemes( @@ -549,6 +549,25 @@ void CookieMonster::SetCookieableSchemes(
MaybeRunCookieCallback(std::move(callback), true); MaybeRunCookieCallback(std::move(callback), true);
} }
@ -72,7 +72,7 @@ index c433232365c93..60e149bafcf68 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index fa5e56d60b093..f776bd0cb82eb 100644 index 213d37d2509c1..557b448117506 100644
--- net/cookies/cookie_monster.h --- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h
@@ -209,6 +209,8 @@ class NET_EXPORT CookieMonster : public CookieStore { @@ -209,6 +209,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@ -123,10 +123,10 @@ index 77c0984d364c6..df7ff7d7355b5 100644
void CookieManager::SetForceKeepSessionState() { void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc diff --git services/network/network_context.cc services/network/network_context.cc
index f42edc973ece8..4e6f8572dae1e 100644 index 3ee7e8145e8cd..40975f0767980 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -2380,17 +2380,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2384,17 +2384,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator()); network_service_->network_quality_estimator());
} }
@ -157,10 +157,10 @@ index f42edc973ece8..4e6f8572dae1e 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>(); trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index d911012bde3ea..07d329823b303 100644 index e4eec4dde2786..b4370e0b3856d 100644
--- services/network/public/mojom/network_context.mojom --- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom
@@ -336,6 +336,9 @@ struct NetworkContextParams { @@ -339,6 +339,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false. // cookies. Otherwise it should be false.
bool persist_session_cookies = false; bool persist_session_cookies = false;

10
patch/patches/services_network_2718.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index ed2ca3323d9bc..8720dfc91c8fb 100644 index e3d2e62326f20..8214d958b0faa 100644
--- content/browser/storage_partition_impl.cc --- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc
@@ -491,10 +491,6 @@ class LoginHandlerDelegate { @@ -492,10 +492,6 @@ class LoginHandlerDelegate {
} }
WebContents* web_contents = web_contents_getter_.Run(); WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index ed2ca3323d9bc..8720dfc91c8fb 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled. // WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true; creating_login_delegate_ = true;
@@ -546,12 +542,6 @@ void OnAuthRequiredContinuation( @@ -547,12 +543,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder> mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder, auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) { base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index ed2ca3323d9bc..8720dfc91c8fb 100644
new LoginHandlerDelegate( new LoginHandlerDelegate(
std::move(auth_challenge_responder), std::move(web_contents_getter), std::move(auth_challenge_responder), std::move(web_contents_getter),
auth_info, is_request_for_primary_main_frame, process_id, request_id, url, auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
@@ -2844,8 +2834,12 @@ void StoragePartitionImpl::GetQuotaSettings( @@ -2854,8 +2844,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return; return;
} }
@ -40,7 +40,7 @@ index ed2ca3323d9bc..8720dfc91c8fb 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback)); storage::GetDefaultDeviceInfoHelper(), std::move(callback));
} }
@@ -2855,9 +2849,12 @@ void StoragePartitionImpl::InitNetworkContext() { @@ -2865,9 +2859,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params = cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New(); cert_verifier::mojom::CertVerifierCreationParams::New();