mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 121.0.6167.0 (#1233107)
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
|
||||
index e89d7153d66d1..226b0f5780944 100644
|
||||
index 6219eadefa976..ff0c649c46af1 100644
|
||||
--- third_party/blink/public/web/web_view.h
|
||||
+++ third_party/blink/public/web/web_view.h
|
||||
@@ -344,6 +344,7 @@ class BLINK_EXPORT WebView {
|
||||
@@ -345,6 +345,7 @@ class BLINK_EXPORT WebView {
|
||||
|
||||
// Sets whether select popup menus should be rendered by the browser.
|
||||
static void SetUseExternalPopupMenus(bool);
|
||||
@ -11,10 +11,10 @@ index e89d7153d66d1..226b0f5780944 100644
|
||||
// Cancels and hides the current popup (datetime, select...) if any.
|
||||
virtual void CancelPagePopup() = 0;
|
||||
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
index c8b7feaa65bfb..314c168660e48 100644
|
||||
index adb1c7ca2fcdf..4cc86141a88bf 100644
|
||||
--- third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||
@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
@@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
|
||||
g_should_use_external_popup_menus = use_external_popup_menus;
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ index c8b7feaa65bfb..314c168660e48 100644
|
||||
}
|
||||
|
||||
namespace {
|
||||
@@ -587,6 +592,7 @@ WebViewImpl::WebViewImpl(
|
||||
@@ -584,6 +589,7 @@ WebViewImpl::WebViewImpl(
|
||||
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
|
||||
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
|
||||
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
|
||||
@ -39,10 +39,10 @@ index c8b7feaa65bfb..314c168660e48 100644
|
||||
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
|
||||
page_base_background_color_(
|
||||
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
|
||||
index dde5e8c51fa5f..9a40a63b4722f 100644
|
||||
index 5a9992141dbbf..ce030e2b02ff0 100644
|
||||
--- third_party/blink/renderer/core/exported/web_view_impl.h
|
||||
+++ third_party/blink/renderer/core/exported/web_view_impl.h
|
||||
@@ -137,7 +137,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||
@@ -139,7 +139,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||
static HashSet<WebViewImpl*>& AllInstances();
|
||||
// Returns true if popup menus should be rendered by the browser, false if
|
||||
// they should be rendered by WebKit (which is the default).
|
||||
@ -52,7 +52,7 @@ index dde5e8c51fa5f..9a40a63b4722f 100644
|
||||
|
||||
// Returns whether frames under this WebView are backed by a compositor.
|
||||
bool does_composite() const { return does_composite_; }
|
||||
@@ -858,6 +859,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||
@@ -861,6 +862,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||
float fake_page_scale_animation_page_scale_factor_ = 0.f;
|
||||
bool fake_page_scale_animation_use_anchor_ = false;
|
||||
|
||||
@ -62,15 +62,15 @@ index dde5e8c51fa5f..9a40a63b4722f 100644
|
||||
gfx::Transform 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 1b643027c374d..41525ebb63602 100644
|
||||
index 4d1c8dcd1fca7..f8de0cf7498aa 100644
|
||||
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
|
||||
@@ -927,7 +927,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
|
||||
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
@@ -928,7 +928,7 @@ PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
|
||||
HTMLSelectElement& select) {
|
||||
NotifyPopupOpeningObservers();
|
||||
- if (WebViewImpl::UseExternalPopupMenus())
|
||||
+ if (web_view_->UseExternalPopupMenus())
|
||||
return MakeGarbageCollected<ExternalPopupMenu>(frame, select);
|
||||
|
||||
DCHECK(RuntimeEnabledFeatures::PagePopupEnabled());
|
||||
- bool use_external_popup_menus = WebViewImpl::UseExternalPopupMenus();
|
||||
+ bool use_external_popup_menus = web_view_->UseExternalPopupMenus();
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
// There is a bug that is causing popup menus in PWA windows on macOS to
|
||||
// sometimes not appear if using external popup menus. Until that bug is
|
||||
|
Reference in New Issue
Block a user