mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision bc084a8b (#530369)
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 b73e62a0420f..b9b463b87031 100644
|
||||
index d0c5134a2ad6..1434134d4212 100644
|
||||
--- third_party/WebKit/Source/core/exported/WebViewImpl.cpp
|
||||
+++ third_party/WebKit/Source/core/exported/WebViewImpl.cpp
|
||||
@@ -256,8 +256,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
@@ -258,8 +258,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
g_should_use_external_popup_menus = use_external_popup_menus;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ index b73e62a0420f..b9b463b87031 100644
|
||||
}
|
||||
|
||||
namespace {
|
||||
@@ -352,6 +357,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
|
||||
@@ -350,6 +355,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 b73e62a0420f..b9b463b87031 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 bfacefa1cf8b..9361917e0a3b 100644
|
||||
index 79a702679fec..f50dca632eb4 100644
|
||||
--- third_party/WebKit/Source/core/exported/WebViewImpl.h
|
||||
+++ third_party/WebKit/Source/core/exported/WebViewImpl.h
|
||||
@@ -107,7 +107,8 @@ class CORE_EXPORT WebViewImpl final
|
||||
@@ -50,10 +50,10 @@ index bfacefa1cf8b..9361917e0a3b 100644
|
||||
TransformationMatrix device_emulation_transform_;
|
||||
|
||||
diff --git third_party/WebKit/Source/core/page/ChromeClientImpl.cpp third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
index 129f3f1cb6c7..4dafa0474923 100644
|
||||
index 98618289cfab..ec154753a350 100644
|
||||
--- third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
+++ third_party/WebKit/Source/core/page/ChromeClientImpl.cpp
|
||||
@@ -777,7 +777,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
@@ -774,7 +774,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
return nullptr;
|
||||
|
||||
NotifyPopupOpeningObservers();
|
||||
@@ -63,10 +63,10 @@ index 129f3f1cb6c7..4dafa0474923 100644
|
||||
|
||||
DCHECK(RuntimeEnabledFeatures::PagePopupEnabled());
|
||||
diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h
|
||||
index ccaade785697..61a406fb4ee1 100644
|
||||
index 8f30d3c30bac..6d156c7837fb 100644
|
||||
--- third_party/WebKit/public/web/WebView.h
|
||||
+++ third_party/WebKit/public/web/WebView.h
|
||||
@@ -361,6 +361,7 @@ class WebView : protected WebWidget {
|
||||
@@ -360,6 +360,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