Update to Chromium version 72.0.3626.0 (#612437)

- Windows: Can now build with either 10.0.17134 or 10.0.17763 SDK.
This commit is contained in:
Marshall Greenblatt
2018-12-26 17:12:11 +02:00
parent 6df612a597
commit 28d24e22d6
51 changed files with 347 additions and 347 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 3a49f93fe488..b8c84c72188a 100644
index e14420e78971..04bcef2abebf 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -325,6 +325,7 @@ class WebView {
@@ -329,6 +329,7 @@ class WebView {
// Sets whether select popup menus should be rendered by the browser.
BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
@ -10,7 +10,7 @@ index 3a49f93fe488..b8c84c72188a 100644
// Hides any popup (suggestions, selects...) that might be showing.
virtual void HidePopups() = 0;
@@ -349,6 +350,8 @@ class WebView {
@@ -353,6 +354,8 @@ class WebView {
unsigned inactive_background_color,
unsigned inactive_foreground_color) = 0;
@ -20,7 +20,7 @@ index 3a49f93fe488..b8c84c72188a 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 295828c1f467..24868ae69280 100644
index 9246cf14bcae..73af3c519b82 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -234,8 +234,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@ -48,7 +48,7 @@ index 295828c1f467..24868ae69280 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 bcb1519760fe..da720ab3b922 100644
index a3c6109531c1..d3a605ff2f09 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@ -61,7 +61,7 @@ index bcb1519760fe..da720ab3b922 100644
// WebWidget methods:
void SetLayerTreeView(WebLayerTreeView*) override;
@@ -247,7 +248,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -250,7 +251,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
HitTestResult CoreHitTestResultAt(const gfx::Point&);
void InvalidateRect(const IntRect&);
@ -70,7 +70,7 @@ index bcb1519760fe..da720ab3b922 100644
void SetBaseBackgroundColorOverride(SkColor);
void ClearBaseBackgroundColorOverride();
void SetBackgroundColorOverride(SkColor);
@@ -596,6 +597,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -599,6 +600,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_;
bool fake_page_scale_animation_use_anchor_;
@ -80,15 +80,15 @@ index bcb1519760fe..da720ab3b922 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 76213af6df93..cab9fbb91ff1 100644
index c7b9280cc19c..b8e22e79f957 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -797,7 +797,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
@@ -801,7 +801,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();
- if (WebViewImpl::UseExternalPopupMenus())
+ if (web_view_->UseExternalPopupMenus())
return new ExternalPopupMenu(frame, select, *web_view_);
return MakeGarbageCollected<ExternalPopupMenu>(frame, select, *web_view_);
DCHECK(RuntimeEnabledFeatures::PagePopupEnabled());