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 120.0.6099.0 (#1217362)

Browse Source 
- chrome: Disable upgrade/downgrade behavior (see #3608)
- chrome: Disable process singleton behavior (see #3609)
- chrome: Disable config as default system browser (see #3613)
This commit is contained in:
Marshall Greenblatt
2023-11-21 14:17:55 -05:00
parent 738192addf
commit f781ea373f
84 changed files with 828 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
patch/patches/content_2015.patch
View File

@@ -12,12 +12,12 @@ index 34cacda8ef225..e0465b8ac1185 100644
version.Set("V8-Version", V8_VERSION_STRING);
std::string host = info.GetHeaderValue("host");
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index 3b58e4f2de295..e0348501c83d8 100644
index 75cc859b67292..6b565adaef9c7 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -774,6 +774,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
resource_request_->has_user_gesture, initiating_origin,
initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
@@ -752,6 +752,22 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
: nullptr,
&loader_factory);
+ if (!handled) {
+ handled = GetContentClient()->browser()->HandleExternalProtocol(
@@ -27,17 +27,22 @@ index 3b58e4f2de295..e0348501c83d8 100644
+ ->IsInFencedFrameTree(),
+ request_info_->sandbox_flags,
+ *resource_request_, initiating_origin,
+ initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
+ request_info_->initiator_document_token
+ ? RenderFrameHostImpl::FromDocumentToken(
+ request_info_->initiator_process_id,
+ *request_info_->initiator_document_token)
+ : nullptr,
+ &loader_factory);
+ }
+
if (loader_factory) {
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 5733e6d1ea77f..5aa0dffc85def 100644
index dcdc54f90f114..cc4d517b22809 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -1060,7 +1060,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -1067,7 +1067,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@@ -46,7 +51,7 @@ index 5733e6d1ea77f..5aa0dffc85def 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1069,6 +1069,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -1076,6 +1076,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@@ -55,7 +60,7 @@ index 5733e6d1ea77f..5aa0dffc85def 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 8b4b26ed9f976..6f01db1ae5ef7 100644
index 06e22b37dfbce..95f433c7c2a5e 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -40,6 +40,7 @@
@@ -66,7 +71,7 @@ index 8b4b26ed9f976..6f01db1ae5ef7 100644
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
@@ -1940,7 +1941,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1961,7 +1962,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
@@ -75,7 +80,7 @@ index 8b4b26ed9f976..6f01db1ae5ef7 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -2154,6 +2155,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2175,6 +2176,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@@ -95,7 +100,7 @@ index 8b4b26ed9f976..6f01db1ae5ef7 100644
// Creates an OverlayWindow to be used for video or Picture-in-Picture.
// This window will house the content shown when in Picture-in-Picture mode.
// This will return a new OverlayWindow.
@@ -2210,6 +2224,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2232,6 +2246,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -107,10 +112,10 @@ index 8b4b26ed9f976..6f01db1ae5ef7 100644
// on blink::features::kUserAgentReduction. Content may cache this value.
virtual std::string GetUserAgent();
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index a4130ad4dc815..b303f6c8768b7 100644
index 72f72e2c6627d..f5ca688e5d9f4 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -96,6 +96,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -100,6 +100,9 @@ class CONTENT_EXPORT ContentRendererClient {
// binding requests from RenderProcessHost::BindReceiver().
virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
@@ -120,7 +125,7 @@ index a4130ad4dc815..b303f6c8768b7 100644
// Notifies that a new RenderFrame has been created.
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
@@ -318,6 +321,10 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -323,6 +326,10 @@ class CONTENT_EXPORT ContentRendererClient {
// This method may invalidate the frame.
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
@@ -132,7 +137,7 @@ index a4130ad4dc815..b303f6c8768b7 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 3c3ebfeec280e..b239506a39b43 100644
index 83daef460d5dd..ec9dd64fde6d8 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -584,6 +584,8 @@ void RenderThreadImpl::Init() {
@@ -145,10 +150,10 @@ index 3c3ebfeec280e..b239506a39b43 100644
base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index cddb519c4c893..68b5fc0f60d9c 100644
index ee367c7306b07..440493e485874 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -941,6 +941,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -948,6 +948,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@@ -165,10 +170,10 @@ index cddb519c4c893..68b5fc0f60d9c 100644
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
return std::make_unique<V8ValueConverterImpl>();
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 84c36d410a352..7904a0050e3bb 100644
index 23c389ed9c731..931165a4e9a8f 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -225,6 +225,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -224,6 +224,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override;
#endif // BUILDFLAG(IS_ANDROID)
@@ -179,10 +184,10 @@ index 84c36d410a352..7904a0050e3bb 100644
// plus eTLD+1, such as https://google.com), or to a more specific origin.
void SetIsLockedToSite();
diff --git content/shell/browser/shell_content_browser_client.cc content/shell/browser/shell_content_browser_client.cc
index 0008e3c7c9600..e639ae5373af0 100644
index 35b1675d9f57f..6e715215ed905 100644
--- content/shell/browser/shell_content_browser_client.cc
+++ content/shell/browser/shell_content_browser_client.cc
@@ -685,7 +685,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
@@ -701,7 +701,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID)
@@ -191,7 +196,7 @@ index 0008e3c7c9600..e639ae5373af0 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -694,6 +694,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
@@ -710,6 +710,7 @@ void ShellContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
ConfigureNetworkContextParamsForShell(context, network_context_params,
cert_verifier_creation_params);
@@ -200,10 +205,10 @@ index 0008e3c7c9600..e639ae5373af0 100644
std::vector<base::FilePath>
diff --git content/shell/browser/shell_content_browser_client.h content/shell/browser/shell_content_browser_client.h
index b33300b6da3ea..fb7d4c5f7b029 100644
index 950e82cd59ab4..1f8b23da6fec5 100644
--- content/shell/browser/shell_content_browser_client.h
+++ content/shell/browser/shell_content_browser_client.h
@@ -137,7 +137,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
@@ -138,7 +138,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID)
device::GeolocationManager* GetGeolocationManager() override;