diff options
Diffstat (limited to 'chromium/third_party/blink')
5 files changed, 9 insertions, 5 deletions
diff --git a/chromium/third_party/blink/public/mojom/BUILD.gn b/chromium/third_party/blink/public/mojom/BUILD.gn index e440af9fcaa..9d49f7975f7 100644 --- a/chromium/third_party/blink/public/mojom/BUILD.gn +++ b/chromium/third_party/blink/public/mojom/BUILD.gn @@ -323,7 +323,7 @@ mojom("mojom_platform") { if (use_ozone) { enabled_features += [ "is_selection_clipboard_buffer_possible" ] } - if (is_android || is_mac) { + if (is_android || is_mac || use_qt) { enabled_features += [ "is_using_open_color_chooser" ] } diff --git a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc index a9096f93d6f..72b16f706f6 100644 --- a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc +++ b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc @@ -70,7 +70,11 @@ void ColorChooserPopupUIController::Trace(Visitor* visitor) const { } void ColorChooserPopupUIController::OpenUI() { +#if !defined(TOOLKIT_QT) OpenPopup(); +#else + OpenColorChooser(); +#endif } void ColorChooserPopupUIController::EndChooser() { diff --git a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc index c925730b94f..59348f52982 100644 --- a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc +++ b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.cc @@ -53,7 +53,7 @@ void ColorChooserUIController::Trace(Visitor* visitor) const { } void ColorChooserUIController::OpenUI() { -#if BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_ANDROID) || defined(TOOLKIT_QT) OpenColorChooser(); #else NOTREACHED() << "ColorChooserUIController should only be used on Android"; @@ -79,7 +79,7 @@ void ColorChooserUIController::DidChooseColor(uint32_t color) { client_->DidChooseColor(Color::FromRGBA32(color)); } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || defined(TOOLKIT_QT) void ColorChooserUIController::OpenColorChooser() { DCHECK(!chooser_); frame_->GetBrowserInterfaceBroker().GetInterface( diff --git a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h index 41e60970bc2..98548943315 100644 --- a/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h +++ b/chromium/third_party/blink/renderer/core/html/forms/color_chooser_ui_controller.h @@ -63,7 +63,7 @@ class CORE_EXPORT ColorChooserUIController void DidChooseColor(uint32_t color) final; protected: -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || defined(TOOLKIT_QT) void OpenColorChooser(); #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) mojo::Remote<mojom::blink::ColorChooser> chooser_; diff --git a/chromium/third_party/blink/renderer/core/page/chrome_client_impl.cc b/chromium/third_party/blink/renderer/core/page/chrome_client_impl.cc index 00ce475fc62..dc409dc5bd4 100644 --- a/chromium/third_party/blink/renderer/core/page/chrome_client_impl.cc +++ b/chromium/third_party/blink/renderer/core/page/chrome_client_impl.cc @@ -698,7 +698,7 @@ ColorChooser* ChromeClientImpl::OpenColorChooser( controller = MakeGarbageCollected<ColorChooserPopupUIController>( frame, this, chooser_client); } else { -#if !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_ANDROID) || !defined(TOOLKIT_QT) NOTREACHED() << "Page popups should be enabled on all but Android"; #endif controller = |