mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 112.0.5615.0
- Windows: VS2022 and Win11 SDK 10.0.22621.0 are now required.
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
index f59ecb8fa3246..bb55ea9d91a73 100644
|
||||
index cb9253cf1ab6a..b46c6b92a30ce 100644
|
||||
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||
@@ -142,6 +142,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
@@ -140,6 +140,10 @@ bool IsPluginLoadingAccessibleResourceInWebView(
|
||||
extensions::ExtensionRegistry* extension_registry,
|
||||
int process_id,
|
||||
const GURL& resource) {
|
||||
@ -42,10 +42,10 @@ index 8b3f569882aeb..afc8007a6228b 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 eab276d6ebe23..aa6ca12d1b8bc 100644
|
||||
index a91227b208c16..d89e3d6ba0ad7 100644
|
||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -971,6 +971,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -983,6 +983,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
|
||||
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
|
||||
status == chrome::mojom::PluginStatus::kBlocked) &&
|
||||
@ -53,7 +53,7 @@ index eab276d6ebe23..aa6ca12d1b8bc 100644
|
||||
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
||||
identifier)) {
|
||||
status = chrome::mojom::PluginStatus::kAllowed;
|
||||
@@ -1138,7 +1139,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1150,7 +1151,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||
@ -63,7 +63,7 @@ index eab276d6ebe23..aa6ca12d1b8bc 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlocked: {
|
||||
@@ -1147,7 +1149,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1159,7 +1161,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 eab276d6ebe23..aa6ca12d1b8bc 100644
|
||||
break;
|
||||
}
|
||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||
@@ -1157,7 +1160,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
@@ -1169,7 +1172,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||
group_name));
|
||||
RenderThread::Get()->RecordAction(
|
||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||
@ -105,7 +105,7 @@ index ad5f1925735fd..a871f4a7792a7 100644
|
||||
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
|
||||
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
|
||||
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
index a731c5ef5b714..99e313b92c242 100644
|
||||
index a7501a57c5149..1c148767f67a6 100644
|
||||
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
@@ -80,6 +80,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
|
||||
@ -118,19 +118,19 @@ index a731c5ef5b714..99e313b92c242 100644
|
||||
|
||||
BrowserPluginGuest::~BrowserPluginGuest() = default;
|
||||
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
|
||||
index aec6a0eb9cbd0..286e7de6887a7 100644
|
||||
index 17e98b60e8f7e..41f05cdd88d40 100644
|
||||
--- content/browser/browser_plugin/browser_plugin_guest.h
|
||||
+++ content/browser/browser_plugin/browser_plugin_guest.h
|
||||
@@ -68,6 +68,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||
|
||||
@@ -70,6 +70,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||
WebContentsImpl* GetWebContents() const;
|
||||
RenderFrameHostImpl* GetProspectiveOuterDocument();
|
||||
|
||||
+ WebContentsImpl* owner_web_contents() const { return owner_web_contents_; }
|
||||
+
|
||||
private:
|
||||
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
|
||||
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
|
||||
@@ -77,6 +79,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||
@@ -79,6 +81,8 @@ class BrowserPluginGuest : public WebContentsObserver {
|
||||
void InitInternal(WebContentsImpl* owner_web_contents);
|
||||
|
||||
const raw_ptr<BrowserPluginGuestDelegate, DanglingUntriaged> delegate_;
|
||||
|
Reference in New Issue
Block a user