mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 87.0.4280.88
This commit is contained in:
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/87.0.4280.66',
|
'chromium_checkout': 'refs/tags/87.0.4280.88',
|
||||||
'depot_tools_checkout': '39d870e1f0'
|
'depot_tools_checkout': '39d870e1f0'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
|
||||||
index c2c0288e048d..617bb86f7ad9 100644
|
index 06c040ecd7ca..6b33c5d25d2a 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.cc
|
--- chrome/browser/chrome_content_browser_client.cc
|
||||||
+++ chrome/browser/chrome_content_browser_client.cc
|
+++ chrome/browser/chrome_content_browser_client.cc
|
||||||
@@ -1036,10 +1036,6 @@ void LaunchURL(const GURL& url,
|
@@ -1036,10 +1036,6 @@ void LaunchURL(const GURL& url,
|
||||||
@@ -13,7 +13,7 @@ index c2c0288e048d..617bb86f7ad9 100644
|
|||||||
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
|
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
|
||||||
// |allowlist| combines pref/policy + cmdline switch in the browser process.
|
// |allowlist| combines pref/policy + cmdline switch in the browser process.
|
||||||
// For renderer and utility (e.g. NetworkService) processes the switch is the
|
// For renderer and utility (e.g. NetworkService) processes the switch is the
|
||||||
@@ -1218,6 +1214,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
|
@@ -1228,6 +1224,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
|
||||||
return *greased_brand_version_list;
|
return *greased_brand_version_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ index c2c0288e048d..617bb86f7ad9 100644
|
|||||||
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
||||||
if (command_line->HasSwitch(switches::kUserAgent)) {
|
if (command_line->HasSwitch(switches::kUserAgent)) {
|
||||||
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
|
||||||
index 4077ac522067..649226ac2ba8 100644
|
index 457d9eee22f0..e45059eb1d42 100644
|
||||||
--- chrome/browser/chrome_content_browser_client.h
|
--- chrome/browser/chrome_content_browser_client.h
|
||||||
+++ chrome/browser/chrome_content_browser_client.h
|
+++ chrome/browser/chrome_content_browser_client.h
|
||||||
@@ -98,7 +98,8 @@ class ChromeXrIntegrationClient;
|
@@ -98,7 +98,8 @@ class ChromeXrIntegrationClient;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
|
||||||
index d789ee040ac5..19e5a5daa343 100644
|
index 19de17320066..1dfba315226f 100644
|
||||||
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
--- chrome/browser/plugins/plugin_info_host_impl.cc
|
||||||
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
+++ chrome/browser/plugins/plugin_info_host_impl.cc
|
||||||
@@ -18,6 +18,7 @@
|
@@ -18,6 +18,7 @@
|
||||||
@@ -82,7 +82,7 @@ index d789ee040ac5..19e5a5daa343 100644
|
|||||||
if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
|
if (security_status == PluginMetadata::SECURITY_STATUS_FULLY_TRUSTED) {
|
||||||
*status = chrome::mojom::PluginStatus::kAllowed;
|
*status = chrome::mojom::PluginStatus::kAllowed;
|
||||||
return;
|
return;
|
||||||
@@ -337,17 +360,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
|
@@ -346,17 +369,41 @@ bool PluginInfoHostImpl::Context::FindEnabledPlugin(
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@ index c1870b0f56ef..d32b8d54fb3f 100644
|
|||||||
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
|
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
|
||||||
if (response_url.SchemeIsHTTPOrHTTPS() &&
|
if (response_url.SchemeIsHTTPOrHTTPS() &&
|
||||||
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
|
||||||
index c9852764a59c..ffe26ef879b9 100644
|
index ce09634902a5..de9cc70a61e2 100644
|
||||||
--- chrome/renderer/chrome_content_renderer_client.cc
|
--- chrome/renderer/chrome_content_renderer_client.cc
|
||||||
+++ chrome/renderer/chrome_content_renderer_client.cc
|
+++ chrome/renderer/chrome_content_renderer_client.cc
|
||||||
@@ -825,6 +825,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -825,6 +825,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
@@ -208,7 +208,7 @@ index c9852764a59c..ffe26ef879b9 100644
|
|||||||
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
|
||||||
identifier)) {
|
identifier)) {
|
||||||
status = chrome::mojom::PluginStatus::kAllowed;
|
status = chrome::mojom::PluginStatus::kAllowed;
|
||||||
@@ -1028,7 +1029,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -1041,7 +1042,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
|
||||||
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
plugin_auth_host.BindNewEndpointAndPassReceiver());
|
||||||
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
|
||||||
@@ -218,7 +218,7 @@ index c9852764a59c..ffe26ef879b9 100644
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case chrome::mojom::PluginStatus::kBlocked: {
|
case chrome::mojom::PluginStatus::kBlocked: {
|
||||||
@@ -1037,7 +1039,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -1050,7 +1052,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
|
||||||
placeholder->AllowLoading();
|
placeholder->AllowLoading();
|
||||||
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
|
||||||
@@ -228,7 +228,7 @@ index c9852764a59c..ffe26ef879b9 100644
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
|
||||||
@@ -1047,7 +1050,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -1060,7 +1063,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
group_name));
|
group_name));
|
||||||
RenderThread::Get()->RecordAction(
|
RenderThread::Get()->RecordAction(
|
||||||
UserMetricsAction("Plugin_BlockedByPolicy"));
|
UserMetricsAction("Plugin_BlockedByPolicy"));
|
||||||
@@ -238,7 +238,7 @@ index c9852764a59c..ffe26ef879b9 100644
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
|
||||||
@@ -1055,7 +1059,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
@@ -1068,7 +1072,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
|
||||||
IDR_BLOCKED_PLUGIN_HTML,
|
IDR_BLOCKED_PLUGIN_HTML,
|
||||||
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
|
||||||
group_name));
|
group_name));
|
||||||
|
@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
|
|||||||
|
|
||||||
} // namespace content
|
} // namespace content
|
||||||
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index 529a5b71b998..dcc5eeda89d3 100644
|
index 1ff402be7362..8d0f0b34e0c9 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_impl.cc
|
--- content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
+++ content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -2831,6 +2831,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
@@ -2842,6 +2842,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
|
||||||
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ index 529a5b71b998..dcc5eeda89d3 100644
|
|||||||
const WebInputEvent& event) {
|
const WebInputEvent& event) {
|
||||||
if ((base::FeatureList::IsEnabled(
|
if ((base::FeatureList::IsEnabled(
|
||||||
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
|
||||||
index 9d7d10136a68..eb989750dd5f 100644
|
index 9f02961f7ef6..9fcd0acfb569 100644
|
||||||
--- content/browser/renderer_host/render_widget_host_impl.h
|
--- content/browser/renderer_host/render_widget_host_impl.h
|
||||||
+++ content/browser/renderer_host/render_widget_host_impl.h
|
+++ content/browser/renderer_host/render_widget_host_impl.h
|
||||||
@@ -730,6 +730,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
@@ -730,6 +730,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
|
||||||
index 082cff368d80..7d7c2fe02646 100644
|
index 60bb552448bd..4939ee6932c7 100644
|
||||||
--- chrome/browser/net/profile_network_context_service.cc
|
--- chrome/browser/net/profile_network_context_service.cc
|
||||||
+++ chrome/browser/net/profile_network_context_service.cc
|
+++ chrome/browser/net/profile_network_context_service.cc
|
||||||
@@ -19,6 +19,7 @@
|
@@ -19,6 +19,7 @@
|
||||||
@@ -10,7 +10,7 @@ index 082cff368d80..7d7c2fe02646 100644
|
|||||||
#include "chrome/browser/browser_process.h"
|
#include "chrome/browser/browser_process.h"
|
||||||
#include "chrome/browser/content_settings/cookie_settings_factory.h"
|
#include "chrome/browser/content_settings/cookie_settings_factory.h"
|
||||||
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
||||||
@@ -666,7 +667,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
@@ -667,7 +668,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||||
|
|
||||||
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
|
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
|
||||||
// default behavior (in memory storage, default sizes).
|
// default behavior (in memory storage, default sizes).
|
||||||
@@ -31,7 +31,7 @@ index 082cff368d80..7d7c2fe02646 100644
|
|||||||
PrefService* local_state = g_browser_process->local_state();
|
PrefService* local_state = g_browser_process->local_state();
|
||||||
// Configure the HTTP cache path and size.
|
// Configure the HTTP cache path and size.
|
||||||
base::FilePath base_cache_path;
|
base::FilePath base_cache_path;
|
||||||
@@ -679,7 +692,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
@@ -680,7 +693,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
|
||||||
base_cache_path.Append(chrome::kCacheDirname);
|
base_cache_path.Append(chrome::kCacheDirname);
|
||||||
network_context_params->http_cache_max_size =
|
network_context_params->http_cache_max_size =
|
||||||
local_state->GetInteger(prefs::kDiskCacheSize);
|
local_state->GetInteger(prefs::kDiskCacheSize);
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||||
index 2640a8c63710..44fe2b74b1ef 100644
|
index 26bd3968521c..6688bc574f8f 100644
|
||||||
--- content/browser/web_contents/web_contents_impl.cc
|
--- content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ content/browser/web_contents/web_contents_impl.cc
|
+++ content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -2770,7 +2770,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
@@ -2770,7 +2770,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||||
index e4aaf55ccfce..2d5d8f53ffb6 100644
|
index eca8e4047814..63aad0c35d01 100644
|
||||||
--- chrome/app/generated_resources.grd
|
--- chrome/app/generated_resources.grd
|
||||||
+++ chrome/app/generated_resources.grd
|
+++ chrome/app/generated_resources.grd
|
||||||
@@ -5081,7 +5081,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
@@ -5081,7 +5081,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||||
|
@@ -3187,7 +3187,7 @@ class RequestTestHandler : public TestHandler {
|
|||||||
CefPostDelayedTask(
|
CefPostDelayedTask(
|
||||||
TID_FILE_USER_VISIBLE,
|
TID_FILE_USER_VISIBLE,
|
||||||
base::Bind(&RequestTestHandler::PostTestCompleteFileTasks, this),
|
base::Bind(&RequestTestHandler::PostTestCompleteFileTasks, this),
|
||||||
100);
|
200);
|
||||||
} else {
|
} else {
|
||||||
TestComplete();
|
TestComplete();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user