Update to Chromium version 86.0.4240.22

This commit is contained in:
Marshall Greenblatt
2020-09-03 22:10:36 -04:00
parent 59a779c38a
commit 848d22607d
9 changed files with 19 additions and 54 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 6cb9ee1f0764..8109a134907e 100644
index d5b479bc9991..fa144b20ce37 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index c7bd97a32af1..311f2c52af8d 100644
index 15657bbf7f7b..398ef9bb6c50 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/crypto.gni")
@@ -37,7 +37,7 @@ index c7bd97a32af1..311f2c52af8d 100644
"//components/profile_metrics",
"//components/safety_check",
"//components/search_provider_logos",
@@ -3905,8 +3912,6 @@ static_library("ui") {
@@ -3910,8 +3917,6 @@ static_library("ui") {
"views/toolbar/home_button.h",
"views/toolbar/reload_button.cc",
"views/toolbar/reload_button.h",

View File

@@ -1,13 +0,0 @@
diff --git ui/gl/gl_utils.cc ui/gl/gl_utils.cc
index 2f0832c0ae75..f8a494b05e42 100644
--- ui/gl/gl_utils.cc
+++ ui/gl/gl_utils.cc
@@ -130,7 +130,7 @@ bool ShouldForceDirectCompositionRootSurfaceFullDamage() {
if ((brga_flags & kSupportBits) == 0)
return false;
return true;
- };
+ }();
return should_force;
}
#endif // OS_WIN

View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 4dca843104ac..63020b374688 100644
index 5c0eea105870..1c82c2d0be99 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2561,15 +2561,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2578,15 +2578,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -33,7 +33,7 @@ index 4dca843104ac..63020b374688 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3368,6 +3375,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3385,6 +3392,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -49,7 +49,7 @@ index 4dca843104ac..63020b374688 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -6850,6 +6866,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -6884,6 +6900,10 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}
@@ -73,10 +73,10 @@ index f1dcf53ea481..192f7c0ddd04 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index f1c25ed4cf62..8bb6e9a374c7 100644
index 9d5bc0a3e914..57f2e66ea415 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -82,8 +82,10 @@ class BrowserContext;
@@ -83,8 +83,10 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@@ -87,7 +87,7 @@ index f1c25ed4cf62..8bb6e9a374c7 100644
class WebUI;
struct CustomContextMenuContext;
struct DropData;
@@ -212,6 +214,10 @@ class WebContents : public PageNavigator,
@@ -213,6 +215,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
network::mojom::WebSandboxFlags starting_sandbox_flags;

View File

@@ -44,10 +44,10 @@ index ba112d79de9a..83f5bd971bc9 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 11b7b4a63f2e..c2714178a4a4 100644
index 3d86affee6ad..1d29b9622763 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1641,7 +1641,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -1647,7 +1647,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@@ -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 45ef79f88b4d..074d5ea48b12 100644
index ed6e86624c7d..f377121a2436 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)
@@ -160,7 +160,7 @@ index 45ef79f88b4d..074d5ea48b12 100644
visitor->Trace(agent_metrics_collector_);
visitor->Trace(plugins_changed_observers_);
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
index b6a1caadf7b7..95fafb720083 100644
index 945730f54afa..3a95342006b2 100644
--- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h
@@ -150,7 +150,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,

View File

@@ -1,13 +0,0 @@
diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc
index 8d8f25e2f57a..5aa055ce855f 100644
--- third_party/blink/renderer/core/input/pointer_event_manager.cc
+++ third_party/blink/renderer/core/input/pointer_event_manager.cc
@@ -304,7 +304,7 @@ void PointerEventManager::HandlePointerInterruption(
for (auto pointer_event : canceled_pointer_events) {
// If we are sending a pointercancel we have sent the pointerevent to some
// target before.
- CHECK(element_under_pointer_.Contains(pointer_event->pointerId()));
+ // CHECK(element_under_pointer_.Contains(pointer_event->pointerId()));
Element* target =
element_under_pointer_.at(pointer_event->pointerId())->target;

View File

@@ -11,7 +11,7 @@ index 4d55813fed92..f41bd4b5590e 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 4b42cd80d5c1..cafb43ea03f1 100644
index cafd4891c5ba..82c9bf7c917e 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -39,7 +39,7 @@ index 4b42cd80d5c1..cafb43ea03f1 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
receiver_(this, std::move(page_handle)) {
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 510c555ca5af..242a208b7328 100644
index b9256a87fdba..e7eaa9a2e448 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -125,7 +125,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -52,7 +52,7 @@ index 510c555ca5af..242a208b7328 100644
// Returns whether frames under this WebView are backed by a compositor.
bool does_composite() const { return does_composite_; }
@@ -645,6 +646,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -650,6 +651,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_ = 0.f;
bool fake_page_scale_animation_use_anchor_ = false;