mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 123.0.6312.0 (#1262506)
- MacOS ARM64 Official builds are currently failing due to https://issues.chromium.org/issues/326898585
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
index 5ee79cf7fefb1..a84750a496095 100644
|
||||
--- chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
+++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
@ -10,7 +10,7 @@ index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
#include "chrome/browser/extensions/extension_tab_util.h"
|
||||
#include "chrome/browser/preloading/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h"
|
||||
#include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
|
||||
@@ -26,6 +27,10 @@
|
||||
@@ -27,6 +28,10 @@
|
||||
#include "pdf/pdf_features.h"
|
||||
#endif // BUILDFLAG(ENABLE_PDF)
|
||||
|
||||
@ -21,7 +21,7 @@ index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
namespace extensions {
|
||||
|
||||
void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -43,6 +48,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -44,6 +49,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
if (!web_contents)
|
||||
return;
|
||||
|
||||
@ -29,7 +29,7 @@ index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
// If the request was for NoStatePrefetch, abort the prefetcher and do not
|
||||
// continue. This is because plugins cancel NoStatePrefetch, see
|
||||
// http://crbug.com/343590.
|
||||
@@ -53,6 +59,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -54,6 +60,7 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
no_state_prefetch_contents->Destroy(prerender::FINAL_STATUS_DOWNLOAD);
|
||||
return;
|
||||
}
|
||||
@ -37,7 +37,7 @@ index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
|
||||
auto* browser_context = web_contents->GetBrowserContext();
|
||||
|
||||
@@ -79,9 +86,18 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
@@ -80,9 +87,18 @@ void StreamsPrivateAPI::SendExecuteMimeTypeHandlerEvent(
|
||||
// forms of zooming won't work).
|
||||
// TODO(1042323): Present a coherent representation of a tab id for portal
|
||||
// contents.
|
||||
@ -60,10 +60,10 @@ index 8cea5bf4591cd..c5fca9dd1a9e8 100644
|
||||
std::unique_ptr<StreamContainer> stream_container(
|
||||
new StreamContainer(tab_id, embedded, handler_url, extension_id,
|
||||
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
|
||||
index 52e6a29f65a91..8e8f92a45526c 100644
|
||||
index 0035aedce82f0..861288525b291 100644
|
||||
--- extensions/browser/extension_host.cc
|
||||
+++ extensions/browser/extension_host.cc
|
||||
@@ -105,12 +105,13 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
@@ -104,12 +104,13 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
host_type == mojom::ViewType::kOffscreenDocument ||
|
||||
host_type == mojom::ViewType::kExtensionPopup ||
|
||||
host_type == mojom::ViewType::kExtensionSidePanel);
|
||||
@ -80,7 +80,7 @@ index 52e6a29f65a91..8e8f92a45526c 100644
|
||||
main_frame_host_ = host_contents_->GetPrimaryMainFrame();
|
||||
|
||||
// Listen for when an extension is unloaded from the same profile, as it may
|
||||
@@ -126,11 +127,49 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
@@ -125,11 +126,49 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
// Create password reuse detection manager when new extension web contents are
|
||||
// created.
|
||||
ExtensionsBrowserClient::Get()->CreatePasswordReuseDetectionManager(
|
||||
@ -132,7 +132,7 @@ index 52e6a29f65a91..8e8f92a45526c 100644
|
||||
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
|
||||
|
||||
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
|
||||
index 94b02bca9b70b..5e3dacc34452a 100644
|
||||
index 28ba09319b047..2a097a5ae4c16 100644
|
||||
--- extensions/browser/extension_host.h
|
||||
+++ extensions/browser/extension_host.h
|
||||
@@ -62,6 +62,12 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
@ -157,7 +157,7 @@ index 94b02bca9b70b..5e3dacc34452a 100644
|
||||
content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
|
||||
content::RenderProcessHost* render_process_host() const;
|
||||
bool has_loaded_once() const { return has_loaded_once_; }
|
||||
@@ -248,7 +254,8 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
@@ -244,7 +250,8 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
raw_ptr<content::BrowserContext> browser_context_;
|
||||
|
||||
// The host for our HTML content.
|
||||
@ -199,7 +199,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
|
||||
}
|
||||
|
||||
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
|
||||
index 5da1cae2970c6..4e193c09c54b1 100644
|
||||
index 1be758c66fe70..62f72c7c119d0 100644
|
||||
--- extensions/browser/extensions_browser_client.h
|
||||
+++ extensions/browser/extensions_browser_client.h
|
||||
@@ -34,6 +34,7 @@
|
||||
@ -234,10 +234,10 @@ index 5da1cae2970c6..4e193c09c54b1 100644
|
||||
// once each time the extensions system is loaded per browser_context. The
|
||||
// implementation may wish to use the BrowserContext to record the current
|
||||
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
|
||||
index 399eba92dc627..60ad5d7dd3831 100644
|
||||
index 3363f44f7c4fc..3eec0356c0c58 100644
|
||||
--- extensions/browser/process_manager.cc
|
||||
+++ extensions/browser/process_manager.cc
|
||||
@@ -379,9 +379,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
@@ -353,9 +353,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
return true; // TODO(kalman): return false here? It might break things...
|
||||
|
||||
DVLOG(1) << "CreateBackgroundHost " << extension->id();
|
||||
|
Reference in New Issue
Block a user