Update to Chromium version 69.0.3476.0 (#571360)

This commit is contained in:
Marshall Greenblatt
2018-07-02 13:11:49 -04:00
parent 669e8673ce
commit 2d48a07bec
47 changed files with 546 additions and 547 deletions

View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index bf85495790f5..83d0f5eadf43 100644
index f4cbe0e0e245..eaabea055764 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -358,6 +358,7 @@ class WebView : protected WebWidget {
@@ -352,6 +352,7 @@ class WebView : protected WebWidget {
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
@ -10,7 +10,7 @@ index bf85495790f5..83d0f5eadf43 100644
// Hides any popup (suggestions, selects...) that might be showing.
virtual void HidePopups() = 0;
@@ -388,6 +389,8 @@ class WebView : protected WebWidget {
@@ -382,6 +383,8 @@ class WebView : protected WebWidget {
unsigned inactive_background_color,
unsigned inactive_foreground_color) = 0;
@ -20,10 +20,10 @@ index bf85495790f5..83d0f5eadf43 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 066b937a6700..290596dceb21 100644
index 60a3df6ea8c1..f513909e9993 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -246,8 +246,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -244,8 +244,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@ -39,7 +39,7 @@ index 066b937a6700..290596dceb21 100644
}
namespace {
@@ -338,6 +343,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
@@ -336,6 +341,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 066b937a6700..290596dceb21 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 3a9f0243cbee..1b402bd2b79f 100644
index b2cd387e5d32..406a9d2119b6 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,
@ -61,7 +61,7 @@ index 3a9f0243cbee..1b402bd2b79f 100644
// WebWidget methods:
void Close() override;
@@ -250,7 +251,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -248,7 +249,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
HitTestResult CoreHitTestResultAt(const WebPoint&);
void InvalidateRect(const IntRect&);
@ -80,10 +80,10 @@ index 3a9f0243cbee..1b402bd2b79f 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 d1d042242009..d2a78831921c 100644
index b46bc592ebfb..b7a95ed26456 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -774,7 +774,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
@@ -779,7 +779,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();