mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision adb61db1 (#508578)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git third_party/WebKit/Source/core/exported/WebViewImpl.cpp third_party/WebKit/Source/core/exported/WebViewImpl.cpp
|
||||
index 827581a9cb57..318e5181545a 100644
|
||||
index 1cc7c6eb7182..67129b9719b5 100644
|
||||
--- third_party/WebKit/Source/core/exported/WebViewImpl.cpp
|
||||
+++ third_party/WebKit/Source/core/exported/WebViewImpl.cpp
|
||||
@@ -247,8 +247,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
@@ -249,8 +249,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
g_should_use_external_popup_menus = use_external_popup_menus;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ index 827581a9cb57..318e5181545a 100644
|
||||
}
|
||||
|
||||
namespace {
|
||||
@@ -342,6 +347,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
|
||||
@@ -346,6 +351,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),
|
||||
@@ -27,7 +27,7 @@ index 827581a9cb57..318e5181545a 100644
|
||||
suppress_next_keypress_event_(false),
|
||||
ime_accept_events_(true),
|
||||
diff --git third_party/WebKit/Source/core/exported/WebViewImpl.h third_party/WebKit/Source/core/exported/WebViewImpl.h
|
||||
index 7ea90b01b4c6..30e54df93efc 100644
|
||||
index 820c1d2a8500..653c868a8444 100644
|
||||
--- third_party/WebKit/Source/core/exported/WebViewImpl.h
|
||||
+++ third_party/WebKit/Source/core/exported/WebViewImpl.h
|
||||
@@ -108,7 +108,8 @@ class CORE_EXPORT WebViewImpl final
|
||||
@@ -40,7 +40,7 @@ index 7ea90b01b4c6..30e54df93efc 100644
|
||||
|
||||
// WebWidget methods:
|
||||
void Close() override;
|
||||
@@ -615,6 +616,8 @@ class CORE_EXPORT WebViewImpl final
|
||||
@@ -613,6 +614,8 @@ class CORE_EXPORT WebViewImpl final
|
||||
float fake_page_scale_animation_page_scale_factor_;
|
||||
bool fake_page_scale_animation_use_anchor_;
|
||||
|
||||
@@ -50,10 +50,10 @@ index 7ea90b01b4c6..30e54df93efc 100644
|
||||
TransformationMatrix device_emulation_transform_;
|
||||
|
||||
diff --git third_party/WebKit/Source/core/page/ChromeClientImpl.cpp third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
index 581b6b5b9538..14aec97bd676 100644
|
||||
index a68ce2c67710..c85fd4cdfa43 100644
|
||||
--- third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
+++ third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
@@ -776,7 +776,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
@@ -774,7 +774,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
return nullptr;
|
||||
|
||||
NotifyPopupOpeningObservers();
|
||||
@@ -63,10 +63,10 @@ index 581b6b5b9538..14aec97bd676 100644
|
||||
|
||||
DCHECK(RuntimeEnabledFeatures::PagePopupEnabled());
|
||||
diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h
|
||||
index 729c1ceabb91..a11ad9e6c86e 100644
|
||||
index 03bfa9b85e7e..6f970fe0802e 100644
|
||||
--- third_party/WebKit/public/web/WebView.h
|
||||
+++ third_party/WebKit/public/web/WebView.h
|
||||
@@ -374,6 +374,7 @@ class WebView : protected WebWidget {
|
||||
@@ -367,6 +367,7 @@ class WebView : protected WebWidget {
|
||||
|
||||
// Sets whether select popup menus should be rendered by the browser.
|
||||
BLINK_EXPORT static void SetUseExternalPopupMenus(bool);
|
||||
|
Reference in New Issue
Block a user