Update to Chromium version 68.0.3433.0 (#559327)

Known issues:
- Windows now requires VS 2017 15.7.1 with 10.0.17134.0 SDK.
This commit is contained in:
Marshall Greenblatt
2018-05-21 15:54:08 +03:00
parent 12cc069b69
commit 08ff72fa20
55 changed files with 414 additions and 356 deletions

View File

@ -20,10 +20,10 @@ index d9cea512dfc0..5a75a1ee5205 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 b6d1e6c88e47..70e250fc0c76 100644
index 8064140d0a08..98eca1ccbe64 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 b6d1e6c88e47..70e250fc0c76 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 b6d1e6c88e47..70e250fc0c76 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 8d945bba1818..9081f247934c 100644
index 8a8c01289cf2..18bc70273c4d 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,
@ -56,7 +56,7 @@ index 8d945bba1818..9081f247934c 100644
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
- static bool UseExternalPopupMenus();
+ void SetUseExternalPopupMenusThisInstance(bool);
+ void SetUseExternalPopupMenusThisInstance(bool) override;
+ bool UseExternalPopupMenus() const;
// WebWidget methods:
@ -70,7 +70,7 @@ index 8d945bba1818..9081f247934c 100644
void SetBaseBackgroundColorOverride(SkColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(SkColor);
@@ -620,6 +621,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -619,6 +620,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;