From d263ebe5a2f6a852e8dc303dcc2fb5f4591e2282 Mon Sep 17 00:00:00 2001 From: Aditya Keerthi Date: Wed, 5 Apr 2023 16:49:06 -0700 Subject: [PATCH] [Cocoa] Refactor caps lock indicator display logic https://bugs.webkit.org/show_bug.cgi?id=255056 rdar://107582325 Reviewed by Wenson Hsieh. * Source/WebCore/rendering/RenderThemeCocoa.mm: (WebCore::canShowCapsLockIndicator): (WebCore::RenderThemeCocoa::shouldHaveCapsLockIndicator const): Canonical link: https://commits.webkit.org/262645@main --- Source/WebCore/rendering/RenderThemeCocoa.mm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/rendering/RenderThemeCocoa.mm b/Source/WebCore/rendering/RenderThemeCocoa.mm index cf8e5da23ba7..de05dbc6d090 100644 --- a/Source/WebCore/rendering/RenderThemeCocoa.mm +++ b/Source/WebCore/rendering/RenderThemeCocoa.mm @@ -72,6 +72,15 @@ @implementation WebCoreRenderThemeBundle constexpr int kVisibleBackgroundImageWidth = 1; constexpr int kMultipleThumbnailShrinkSize = 2; +#if USE(APPLE_INTERNAL_SDK) +#include +#else +static inline bool canShowCapsLockIndicator() +{ + return true; +} +#endif + RenderThemeCocoa& RenderThemeCocoa::singleton() { return static_cast(RenderTheme::singleton()); @@ -90,7 +99,7 @@ @implementation WebCoreRenderThemeBundle bool RenderThemeCocoa::shouldHaveCapsLockIndicator(const HTMLInputElement& element) const { - return element.isPasswordField(); + return canShowCapsLockIndicator() && element.isPasswordField(); } Color RenderThemeCocoa::pictureFrameColor(const RenderObject& buttonRenderer)