mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 100.0.4896.0 (#972766)
This commit is contained in:
Marshall Greenblatt
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
|
||||
index ec6be2ff24d23..159ed7776c0aa 100644
|
||||
index fc87fd9a6ffca..99c6b27018e13 100644
|
||||
--- content/browser/devtools/devtools_http_handler.cc
|
||||
+++ content/browser/devtools/devtools_http_handler.cc
|
||||
@@ -576,7 +576,7 @@ void DevToolsHttpHandler::OnJsonRequest(
|
||||
@@ -12,7 +12,7 @@ index ec6be2ff24d23..159ed7776c0aa 100644
|
||||
GetContentClient()->browser()->GetUserAgent());
|
||||
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
|
||||
index c1235f9658b88..040d9afb0d9ff 100644
|
||||
index b5c2dc992fb19..868661c86c39a 100644
|
||||
--- content/browser/loader/navigation_url_loader_impl.cc
|
||||
+++ content/browser/loader/navigation_url_loader_impl.cc
|
||||
@@ -665,6 +665,14 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
|
||||
@@ -31,7 +31,7 @@ index c1235f9658b88..040d9afb0d9ff 100644
|
||||
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 2579cf2ce325d..03b60ce3b17cb 100644
|
||||
index 0e2c7f92937f1..31bb164e25bf6 100644
|
||||
--- content/public/browser/content_browser_client.cc
|
||||
+++ content/public/browser/content_browser_client.cc
|
||||
@@ -11,7 +11,7 @@
|
||||
@@ -43,7 +43,7 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
|
||||
|
||||
#include <utility>
|
||||
|
||||
@@ -877,7 +877,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
|
||||
@@ -883,7 +883,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
|
||||
void ContentBrowserClient::OnNetworkServiceCreated(
|
||||
network::mojom::NetworkService* network_service) {}
|
||||
|
||||
@@ -52,7 +52,7 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
|
||||
BrowserContext* context,
|
||||
bool in_memory,
|
||||
const base::FilePath& relative_partition_path,
|
||||
@@ -886,6 +886,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
|
||||
@@ -892,6 +892,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
|
||||
cert_verifier_creation_params) {
|
||||
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
|
||||
network_context_params->accept_language = "en-us,en";
|
||||
@@ -61,18 +61,18 @@ index 2579cf2ce325d..03b60ce3b17cb 100644
|
||||
|
||||
std::vector<base::FilePath>
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index 7d3fafd564118..789bfd693888f 100644
|
||||
index aa125be3640fe..bf5dec73a5287 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -33,6 +33,7 @@
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "content/public/browser/login_delegate.h"
|
||||
#include "content/public/browser/mojo_binder_policy_map.h"
|
||||
#include "content/public/browser/storage_partition_config.h"
|
||||
+#include "content/public/browser/web_contents.h"
|
||||
#include "content/public/browser/web_ui_browser_interface_broker_registry.h"
|
||||
#include "content/public/common/alternative_error_page_override_info.mojom.h"
|
||||
#include "content/public/common/main_function_params.h"
|
||||
#include "content/public/common/page_visibility_state.h"
|
||||
@@ -1634,7 +1635,7 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1658,7 +1659,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.
|
||||
@@ -81,7 +81,7 @@ index 7d3fafd564118..789bfd693888f 100644
|
||||
BrowserContext* context,
|
||||
bool in_memory,
|
||||
const base::FilePath& relative_partition_path,
|
||||
@@ -1823,6 +1824,17 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -1859,6 +1860,17 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
RenderFrameHost* initiator_document,
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
|
||||
|
||||
@@ -96,10 +96,10 @@ index 7d3fafd564118..789bfd693888f 100644
|
||||
+ RenderFrameHost* initiator_document,
|
||||
+ mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory) { return false; }
|
||||
+
|
||||
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
|
||||
// will house the content shown when in Picture-in-Picture mode. This will
|
||||
// return a new OverlayWindow.
|
||||
@@ -1879,6 +1891,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Creates an OverlayWindow to be used for video or document
|
||||
// Picture-in-Picture respectively. This window will house the content shown
|
||||
// when in Picture-in-Picture mode. This will return a new OverlayWindow.
|
||||
@@ -1920,6 +1932,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Used as part of the user agent string.
|
||||
virtual std::string GetProduct();
|
||||
|
||||
@@ -111,10 +111,10 @@ index 7d3fafd564118..789bfd693888f 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 b914cb91a2b49..2f84201ba4d1e 100644
|
||||
index 63ead7f8ab838..11f606368d9e8 100644
|
||||
--- content/public/renderer/content_renderer_client.h
|
||||
+++ content/public/renderer/content_renderer_client.h
|
||||
@@ -87,6 +87,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
@@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
// binding requests from RenderProcessHost::BindReceiver().
|
||||
virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
|
||||
|
||||
@@ -124,7 +124,7 @@ index b914cb91a2b49..2f84201ba4d1e 100644
|
||||
// Notifies that a new RenderFrame has been created.
|
||||
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
|
||||
|
||||
@@ -298,6 +301,10 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
@@ -303,6 +306,10 @@ class CONTENT_EXPORT ContentRendererClient {
|
||||
// This method may invalidate the frame.
|
||||
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
|
||||
|
||||
@@ -136,10 +136,10 @@ index b914cb91a2b49..2f84201ba4d1e 100644
|
||||
// started.
|
||||
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
|
||||
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
|
||||
index 03f9fac832072..1f45e54e32da9 100644
|
||||
index 0b42cba866722..d2f0841bd9069 100644
|
||||
--- content/renderer/render_thread_impl.cc
|
||||
+++ content/renderer/render_thread_impl.cc
|
||||
@@ -640,6 +640,8 @@ void RenderThreadImpl::Init() {
|
||||
@@ -656,6 +656,8 @@ void RenderThreadImpl::Init() {
|
||||
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
|
||||
blink::URLLoaderThrottleProviderType::kFrame);
|
||||
|
||||
@@ -149,10 +149,10 @@ index 03f9fac832072..1f45e54e32da9 100644
|
||||
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
|
||||
|
||||
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
|
||||
index b4e37bbdd3a80..1d16b769a6329 100644
|
||||
index a64d78c9d8112..0551db7f7d4cc 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.cc
|
||||
+++ content/renderer/renderer_blink_platform_impl.cc
|
||||
@@ -1082,6 +1082,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
||||
@@ -1090,6 +1090,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -169,10 +169,10 @@ index b4e37bbdd3a80..1d16b769a6329 100644
|
||||
RendererBlinkPlatformImpl::GetCodeCacheHost() {
|
||||
base::AutoLock lock(code_cache_host_lock_);
|
||||
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
|
||||
index 2191ab72dcacc..d902eb707cc99 100644
|
||||
index 10c96d3915e64..060087d2436ea 100644
|
||||
--- content/renderer/renderer_blink_platform_impl.h
|
||||
+++ content/renderer/renderer_blink_platform_impl.h
|
||||
@@ -260,6 +260,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||
@@ -261,6 +261,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||
blink::WebVector<blink::WebContentSecurityPolicyHeader>* csp) override;
|
||||
base::PlatformThreadId GetIOThreadId() const override;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user