Update to Chromium version 69.0.3483.0 (#572879)

This commit is contained in:
Marshall Greenblatt
2018-07-06 13:11:55 -04:00
parent 123324f5f9
commit 6301e06c8a
34 changed files with 128 additions and 145 deletions

View File

@ -20,10 +20,10 @@ index f4cbe0e0e245..eaabea055764 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 60a3df6ea8c1..f513909e9993 100644
index 789ba3b847d5..612b1a23ebe4 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -244,8 +244,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -242,8 +242,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@ -39,7 +39,7 @@ index 60a3df6ea8c1..f513909e9993 100644
}
namespace {
@@ -336,6 +341,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -334,6 +339,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,10 +48,10 @@ index 60a3df6ea8c1..f513909e9993 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 b2cd387e5d32..406a9d2119b6 100644
index a47150a8df45..3c5ee6d2e723 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -105,7 +105,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -103,7 +103,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
static HashSet<WebViewImpl*>& AllInstances();
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@ -61,7 +61,7 @@ index b2cd387e5d32..406a9d2119b6 100644
// WebWidget methods:
void Close() override;
@@ -248,7 +249,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -246,7 +247,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
HitTestResult CoreHitTestResultAt(const WebPoint&);
void InvalidateRect(const IntRect&);
@ -70,7 +70,7 @@ index b2cd387e5d32..406a9d2119b6 100644
void SetBaseBackgroundColorOverride(SkColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(SkColor);
@@ -617,6 +618,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -602,6 +603,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;