summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2020-12-17 15:17:12 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:20:04 +0200
commitd05e7d1c909c895abcaec975dc3ce0464f2c68c0 (patch)
treecb50d5c084551309f614fd72dcfbd1fcde194f4c
parent4c437e940440de36c19f1afd7be1ff780b37ef8b (diff)
downloadqtwebengine-chromium-d05e7d1c909c895abcaec975dc3ce0464f2c68c0.tar.gz
Use color chooser if FormControlsRefresh is enabled
With this, FormControlsRefresh doesn't break tst_Dialogs::colorDialogRequested() auto test. Change-Id: I9617458aac6837a9767d89f0bf964aeb2e0bfd7c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/blink/renderer/core/html/forms/color_chooser_popup_ui_controller.cc4
1 files changed, 4 insertions, 0 deletions
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 b6b50c9e9bf..7b9ea3e5991 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,8 +70,12 @@ void ColorChooserPopupUIController::Trace(Visitor* visitor) const {
}
void ColorChooserPopupUIController::OpenUI() {
+#if !defined(TOOLKIT_QT)
if (client_->ShouldShowSuggestions() ||
features::IsFormControlsRefreshEnabled())
+#else
+ if (client_->ShouldShowSuggestions())
+#endif // !defined(TOOLKIT_QT)
OpenPopup();
else
OpenColorChooser();