Update to Chromium version 68.0.3399.0 (#551554)

This commit is contained in:
Marshall Greenblatt
2018-05-14 14:24:05 +03:00
parent 66484d799e
commit 8426da0de6
44 changed files with 312 additions and 319 deletions

View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index e6ab3248281e..645fab919ace 100644
index d8228df7ddc2..2f05b96c8dc3 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -357,6 +357,7 @@ class WebView : protected WebWidget {
@@ -20,10 +20,10 @@ index e6ab3248281e..645fab919ace 100644
// Call these methods before and after running a nested, modal event loop
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 0d070fb8df7c..de3b889ce29a 100644
index 4ddb6f53a697..0eb812404164 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@@ -39,7 +39,7 @@ index 0d070fb8df7c..de3b889ce29a 100644
}
namespace {
@@ -343,6 +348,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -342,6 +347,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
enable_fake_page_scale_animation_for_testing_(false),
fake_page_scale_animation_page_scale_factor_(0),
fake_page_scale_animation_use_anchor_(false),
@@ -48,7 +48,7 @@ index 0d070fb8df7c..de3b889ce29a 100644
suppress_next_keypress_event_(false),
ime_accept_events_(true),
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 68fadab79a6e..bc397a361f39 100644
index b607b9168a4e..2d42d89da893 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -102,7 +102,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -61,7 +61,7 @@ index 68fadab79a6e..bc397a361f39 100644
// WebWidget methods:
void Close() override;
@@ -246,7 +247,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -247,7 +248,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
HitTestResult CoreHitTestResultAt(const WebPoint&);
void InvalidateRect(const IntRect&);
@@ -70,7 +70,7 @@ index 68fadab79a6e..bc397a361f39 100644
void SetBaseBackgroundColorOverride(WebColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(WebColor);
@@ -619,6 +620,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -620,6 +621,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;
@@ -80,12 +80,12 @@ index 68fadab79a6e..bc397a361f39 100644
TransformationMatrix device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 484f950bd065..a0c47c7ea782 100644
index 2d13e950b6be..136eb209570b 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -783,7 +783,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
return nullptr;
@@ -780,7 +780,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();
- if (WebViewImpl::UseExternalPopupMenus())
+ if (web_view_->UseExternalPopupMenus())