Update to Chromium version 68.0.3425.0 (#557062)

Known issues:
- Surface synchronization is now enabled for OSR, see issue #2447.
- Jumbo build is broken, fixed in https://crrev.com/868717ce.
This commit is contained in:
Marshall Greenblatt
2018-05-20 16:51:42 +03:00
parent a9f0fa9dfe
commit cd27cbc802
63 changed files with 472 additions and 404 deletions

View File

@@ -1,8 +1,8 @@
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
index ab0b50b62aac..d17bc04e53bf 100644
index 6f3759f4d66f..c7d7188444b1 100644
--- content/browser/browser_plugin/browser_plugin_guest.cc
+++ content/browser/browser_plugin/browser_plugin_guest.cc
@@ -315,8 +315,11 @@ void BrowserPluginGuest::InitInternal(
@@ -314,8 +314,11 @@ void BrowserPluginGuest::InitInternal(
static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
}
@@ -15,7 +15,7 @@ index ab0b50b62aac..d17bc04e53bf 100644
// Once a BrowserPluginGuest has an embedder WebContents, it's considered to
// be attached.
@@ -791,10 +794,19 @@ void BrowserPluginGuest::OnWillAttachComplete(
@@ -790,10 +793,19 @@ void BrowserPluginGuest::OnWillAttachComplete(
static_cast<WebContentsViewGuest*>(GetWebContents()->GetView());
if (!web_contents()->GetRenderViewHost()->GetWidget()->GetView()) {
web_contents_view->CreateViewForWidget(
@@ -266,7 +266,7 @@ index d05dd5421458..fa13775f0512 100644
// a BrowserPlugin even when we are using cross process frames for guests. It
// should be removed after resolving https://crbug.com/642826).
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 54c9b6320d9c..d474ead5f147 100644
index 8aa4bd7ffca6..0a649863f381 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -193,6 +193,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -277,8 +277,8 @@ index 54c9b6320d9c..d474ead5f147 100644
+ delegate_->OverrideWebContentsCreateParams(&params);
// TODO(erikchen): Fix ownership semantics for guest views.
// https://crbug.com/832879.
auto* web_contents = WebContents::Create(params).release();
@@ -230,6 +232,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const {
callback.Run(WebContents::Create(params).release());
@@ -228,6 +230,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const {
return true;
}
@@ -298,7 +298,7 @@ index 54c9b6320d9c..d474ead5f147 100644
WebContents* source,
const content::OpenURLParams& params) {
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 2bc53e063aae..9814b40f84ea 100644
index 7f0df3d7dc3a..82e2e8a8cdc6 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -108,6 +108,10 @@ class MimeHandlerViewGuest :