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 88.0.4324.0 (#827102)

Browse Source 
- Mac: Xcode 12.2 and the MacOS 11.0 SDK are now required for building.
- MacOS 10.10 (Yosemite) is no longer supported (see https://crbug.com/1126056).
- Flash is no longer supported (see https://www.chromium.org/flash-roadmap).
This commit is contained in:
Marshall Greenblatt
2020-12-02 17:31:49 -05:00
parent 7d1d3c0206
commit a584bd187b
143 changed files with 1065 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patch/patches/chrome_plugins.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
index d789ee040ac5..19e5a5daa343 100644
index 1d19e684d0c2..382423f3f2ce 100644
--- chrome/browser/plugins/plugin_info_host_impl.cc
+++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@
@@ -10,7 +10,7 @@ index d789ee040ac5..19e5a5daa343 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -54,6 +55,11 @@
@@ -53,6 +54,11 @@
#include "url/gurl.h"
#include "url/origin.h"
@@ -22,7 +22,7 @@ index d789ee040ac5..19e5a5daa343 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "components/guest_view/browser/guest_view_base.h"
#include "extensions/browser/extension_registry.h"
@@ -100,6 +106,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
@@ -99,6 +105,9 @@ bool IsPluginLoadingAccessibleResourceInWebView(
extensions::ExtensionRegistry* extension_registry,
int process_id,
const GURL& resource) {
@@ -32,7 +32,7 @@ index d789ee040ac5..19e5a5daa343 100644
extensions::WebViewRendererState* renderer_state =
extensions::WebViewRendererState::GetInstance();
std::string partition_id;
@@ -128,9 +137,6 @@ bool IsPluginLoadingAccessibleResourceInWebView(
@@ -127,9 +136,6 @@ bool IsPluginLoadingAccessibleResourceInWebView(
PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
: render_process_id_(render_process_id),
@@ -42,7 +42,7 @@ index d789ee040ac5..19e5a5daa343 100644
host_content_settings_map_(
HostContentSettingsMapFactory::GetForProfile(profile)),
plugin_prefs_(PluginPrefs::GetForProfile(profile)) {
@@ -138,6 +144,13 @@ PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
@@ -137,6 +143,13 @@ PluginInfoHostImpl::Context::Context(int render_process_id, Profile* profile)
profile->GetPrefs());
run_all_flash_in_allow_mode_.Init(prefs::kRunAllFlashInAllowMode,
profile->GetPrefs());
@@ -56,7 +56,7 @@ index d789ee040ac5..19e5a5daa343 100644
}
PluginInfoHostImpl::Context::~Context() {}
@@ -208,7 +221,8 @@ void PluginInfoHostImpl::PluginsLoaded(
@@ -207,7 +220,8 @@ void PluginInfoHostImpl::PluginsLoaded(
plugin_metadata->identifier(), &output->status);
}
@@ -66,7 +66,7 @@ index d789ee040ac5..19e5a5daa343 100644
// Check to see if the component updater can fetch an implementation.
std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info =
g_browser_process->component_updater()->GetComponentForMimeType(
@@ -229,6 +243,15 @@ void PluginInfoHostImpl::Context::DecidePluginStatus(
@@ -228,6 +242,15 @@ void PluginInfoHostImpl::Context::DecidePluginStatus(
PluginMetadata::SecurityStatus security_status,
const std::string& plugin_identifier,
chrome::mojom::PluginStatus* status) const {
@@ -82,7 +82,7 @@ index d789ee040ac5..19e5a5daa343 100644
if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
*status = chrome::mojom::PluginStatus::kAllowed;
return;
@@ -337,17 +360,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
@@ -345,17 +368,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
return false;
}
@@ -127,7 +127,7 @@ index d789ee040ac5..19e5a5daa343 100644
bool enabled = i < matching_plugins.size();
if (!enabled) {
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
index 1471b8f2a414..a856ce635719 100644
index c78907c1d4ea..8297fa6a0162 100644
--- chrome/browser/plugins/plugin_utils.cc
+++ chrome/browser/plugins/plugin_utils.cc
@@ -5,6 +5,7 @@
@@ -138,7 +138,7 @@ index 1471b8f2a414..a856ce635719 100644
#include "chrome/browser/profiles/profile_io_data.h"
#include "chrome/common/plugin_utils.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -14,6 +15,10 @@
@@ -15,6 +16,10 @@
#include "url/gurl.h"
#include "url/origin.h"
@@ -149,7 +149,7 @@ index 1471b8f2a414..a856ce635719 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
@@ -181,6 +186,12 @@ base::flat_map<std::string, std::string>
@@ -168,6 +173,12 @@ base::flat_map<std::string, std::string>
PluginUtils::GetMimeTypeToExtensionIdMap(
content::BrowserContext* browser_context) {
base::flat_map<std::string, std::string> mime_type_to_extension_id_map;
@@ -197,10 +197,10 @@ index c1870b0f56ef..d32b8d54fb3f 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index c9852764a59c..ffe26ef879b9 100644
index 7dbbe8742ca4..01a8b2e3eb24 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -825,6 +825,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -831,6 +831,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -208,7 +208,7 @@ index c9852764a59c..ffe26ef879b9 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1028,7 +1029,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1029,7 +1030,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -218,7 +218,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1037,7 +1039,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1038,7 +1040,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -228,7 +228,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1047,7 +1050,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1048,7 +1051,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -238,7 +238,7 @@ index c9852764a59c..ffe26ef879b9 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1055,7 +1059,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1056,7 +1060,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));
@@ -249,10 +249,10 @@ index c9852764a59c..ffe26ef879b9 100644
}
case chrome::mojom::PluginStatus::kComponentUpdateRequired: {
diff --git chrome/renderer/plugins/chrome_plugin_placeholder.cc chrome/renderer/plugins/chrome_plugin_placeholder.cc
index 4e883820f752..267c6af2af6b 100644
index f1370e70cc04..2109770d03e7 100644
--- chrome/renderer/plugins/chrome_plugin_placeholder.cc
+++ chrome/renderer/plugins/chrome_plugin_placeholder.cc
@@ -364,8 +364,11 @@ void ChromePluginPlaceholder::OnBlockedContent(
@@ -356,8 +356,11 @@ void ChromePluginPlaceholder::OnBlockedContent(
if (status ==
content::RenderFrame::PeripheralContentStatus::CONTENT_STATUS_TINY) {
@@ -267,7 +267,7 @@ index 4e883820f752..267c6af2af6b 100644
std::string message = base::StringPrintf(
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
index 4e1cf0118cb7..af941abfe235 100644
index 347c1f83b873..9d77ef57274d 100644
--- content/browser/browser_plugin/browser_plugin_guest.h
+++ content/browser/browser_plugin/browser_plugin_guest.h
@@ -127,6 +127,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,