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/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
index 95cd290b601a3..89e8ab892e5ea 100644
|
||||
index a1d7adcdd27c4..d3dc736a04286 100644
|
||||
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
@@ -140,6 +140,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
@ -42,10 +42,10 @@ index 438276b719c2f..69635e429be78 100644
|
||||
const extensions::Extension* extension =
|
||||
registry->enabled_extensions().GetByID(extension_id);
|
||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||
index 1521706e2be6b..08f77de0886dd 100644
|
||||
index 04a7dbd25904c..41103cee6e47f 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -999,6 +999,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1002,6 +1002,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
|
||||
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
||||
status == chrome::mojom::PluginStatus::kBlocked) &&
|
||||
@ -53,7 +53,7 @@ index 1521706e2be6b..08f77de0886dd 100644
|
||||
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
||||
identifier)) {
|
||||
status = chrome::mojom::PluginStatus::kAllowed;
|
||||
@@ -1161,7 +1162,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1164,7 +1165,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||
@ -63,7 +63,7 @@ index 1521706e2be6b..08f77de0886dd 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlocked: {
|
||||
@@ -1170,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1173,7 +1175,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
||||
placeholder->AllowLoading();
|
||||
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
||||
@ -73,7 +73,7 @@ index 1521706e2be6b..08f77de0886dd 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||
@@ -1180,7 +1183,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1183,7 +1186,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
group_name));
|
||||
RenderThread::Get()->RecordAction(
|
||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||
|
Reference in New Issue
Block a user