mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 68.0.3425.0 (#557062)
Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
|
||||
index c25144ef9318..343d1de5f03a 100644
|
||||
index d9cea512dfc0..5a75a1ee5205 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 {
|
||||
@@ -14,13 +14,13 @@ index c25144ef9318..343d1de5f03a 100644
|
||||
unsigned inactive_background_color,
|
||||
unsigned inactive_foreground_color) = 0;
|
||||
|
||||
+ virtual void SetBaseBackgroundColor(WebColor color) = 0;
|
||||
+ virtual void SetBaseBackgroundColor(SkColor color) = 0;
|
||||
+
|
||||
// Modal dialog support ------------------------------------------------
|
||||
|
||||
// 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 7298a752d360..26bac8472a20 100644
|
||||
index b6d1e6c88e47..70e250fc0c76 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) {
|
||||
@@ -48,7 +48,7 @@ index 7298a752d360..26bac8472a20 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 7d13f1c07529..1c664d42eb17 100644
|
||||
index 8d945bba1818..9081f247934c 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,
|
||||
@@ -65,12 +65,12 @@ index 7d13f1c07529..1c664d42eb17 100644
|
||||
HitTestResult CoreHitTestResultAt(const WebPoint&);
|
||||
void InvalidateRect(const IntRect&);
|
||||
|
||||
- void SetBaseBackgroundColor(WebColor);
|
||||
+ void SetBaseBackgroundColor(WebColor) override;
|
||||
void SetBaseBackgroundColorOverride(WebColor);
|
||||
- void SetBaseBackgroundColor(SkColor);
|
||||
+ void SetBaseBackgroundColor(SkColor) override;
|
||||
void SetBaseBackgroundColorOverride(SkColor);
|
||||
void ClearBaseBackgroundColorOverride();
|
||||
void SetBackgroundColorOverride(WebColor);
|
||||
@@ -622,6 +623,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||
void SetBackgroundColorOverride(SkColor);
|
||||
@@ -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,7 +80,7 @@ index 7d13f1c07529..1c664d42eb17 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 6af373a6468c..c9b5d47d9141 100644
|
||||
index 6b9ce0b88e7d..4fd152419225 100644
|
||||
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
@@ -781,7 +781,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
|
||||
|
Reference in New Issue
Block a user