Update to Chromium version 89.0.4389.90

This commit is contained in:
Marshall Greenblatt
2021-03-18 19:16:37 -04:00
parent 317059b72a
commit 2b76680114
9 changed files with 26 additions and 26 deletions

View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/89.0.4389.72',
'chromium_checkout': 'refs/tags/89.0.4389.90',
'depot_tools_checkout': '1f976d6f30'
}

View File

@@ -1,8 +1,8 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index d2d167ebf5ef..17a121f4c178 100644
index 462373a8a8aa..7d54bca43243 100644
--- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc
@@ -1680,6 +1680,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
@@ -1690,6 +1690,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
// DeclarativeApiTest.PersistRules.
if (actual_process_lock.matches_scheme(url::kDataScheme))
return true;

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 508e6780855e..bf5e601743eb 100644
index 2ace902f57a7..b0701df94ae2 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -18,7 +18,7 @@ index 508e6780855e..bf5e601743eb 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2492,6 +2494,10 @@ static_library("browser") {
@@ -2491,6 +2493,10 @@ static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index 508e6780855e..bf5e601743eb 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -5103,7 +5109,7 @@ static_library("browser") {
@@ -5106,7 +5112,7 @@ static_library("browser") {
]
}

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 3246037f9042..b1fa4271f21a 100644
index af5a31d3411a..7a444288d34a 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -1067,10 +1067,6 @@ void LaunchURL(const GURL& url,
@@ -1068,10 +1068,6 @@ void LaunchURL(const GURL& url,
}
}
@@ -13,7 +13,7 @@ index 3246037f9042..b1fa4271f21a 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1258,6 +1254,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
@@ -1259,6 +1255,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
return *greased_brand_version_list;
}
@@ -29,7 +29,7 @@ index 3246037f9042..b1fa4271f21a 100644
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) {
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 0ba8a08f75b6..7c9fef98a48e 100644
index d6e0a910ef96..7daf665e7bbd 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -108,7 +108,8 @@ class ChromeXrIntegrationClient;

View File

@@ -198,10 +198,10 @@ index ce40f0039fe0..c8cbecb61455 100644
// that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 8268205a1db1..283807a0dd6a 100644
index 0e417d912d48..0a57bdaa60bd 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -848,6 +848,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -855,6 +855,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@@ -209,7 +209,7 @@ index 8268205a1db1..283807a0dd6a 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1046,7 +1047,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1053,7 +1054,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@@ -219,7 +219,7 @@ index 8268205a1db1..283807a0dd6a 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1055,7 +1057,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1062,7 +1064,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@@ -229,7 +229,7 @@ index 8268205a1db1..283807a0dd6a 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1065,7 +1068,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1072,7 +1075,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@@ -239,7 +239,7 @@ index 8268205a1db1..283807a0dd6a 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1073,7 +1077,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1080,7 +1084,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));

View File

@@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 6a837ad9df98..7abef83f2a47 100644
index 4e18b86882ee..c0f34c47fad7 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@

View File

@@ -240,7 +240,7 @@ index 4bb04980b544..4e1e448a8bfc 100644
std::string /* mime_type */,
bool /* found */,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 64493c6a92a3..f4ffb03b1c63 100644
index c84ae68f2f27..f90cdd146210 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@@ -253,7 +253,7 @@ index 64493c6a92a3..f4ffb03b1c63 100644
#include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 2cfb4a2bb17d..be665a224f63 100644
index c4fc708ab278..2c9f4e1f4dfe 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -32,6 +32,7 @@
@@ -264,7 +264,7 @@ index 2cfb4a2bb17d..be665a224f63 100644
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
#include "device/vr/buildflags/buildflags.h"
@@ -1713,6 +1714,14 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1714,6 +1715,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const base::Optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@@ -279,7 +279,7 @@ index 2cfb4a2bb17d..be665a224f63 100644
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
// will house the content shown when in Picture-in-Picture mode. This will
// return a new OverlayWindow.
@@ -1784,6 +1793,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1785,6 +1794,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -340,7 +340,7 @@ index a4695ba832fc..3eb41cb569b1 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index a401af64fad7..229b79fb71d7 100644
index d59a55cc4ec2..3a3e5b7336df 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3639,7 +3639,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(

View File

@@ -85,7 +85,7 @@ index 0608c4defc6d..54eaa2197957 100644
void DevToolsSession::DispatchProtocolCommand(
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index 917971802305..9023649857ec 100644
index 022b95ec4ecc..ba58b796e35e 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -212,7 +212,8 @@ Page::Page(PageClients& page_clients)
@@ -98,7 +98,7 @@ index 917971802305..9023649857ec 100644
// TODO(pdr): Initialize |validation_message_client_| lazily.
validation_message_client_(
MakeGarbageCollected<ValidationMessageClientImpl>(*this)),
@@ -396,21 +397,41 @@ void Page::InitialStyleChanged() {
@@ -395,21 +396,41 @@ void Page::InitialStyleChanged() {
}
}
@@ -149,7 +149,7 @@ index 917971802305..9023649857ec 100644
page->NotifyPluginsChanged();
}
}
@@ -922,7 +943,8 @@ void Page::Trace(Visitor* visitor) const {
@@ -921,7 +942,8 @@ void Page::Trace(Visitor* visitor) const {
visitor->Trace(link_highlight_);
visitor->Trace(spatial_navigation_controller_);
visitor->Trace(main_frame_);

View File

@@ -77,7 +77,7 @@ index fb648cda4e1a..15bb56c8ae4f 100644
// Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 68688f094a68..9eaabb3431e2 100644
index 065393eeee18..543b645dd380 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -238,8 +238,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {