Cherry-pick ee38052. rdar://117909679

macOS: Text cursor in HTML note is black, regardless of set Accent Color https://bugs.webkit.org/show_bug.cgi?id=264189 rdar://117909679 Reviewed by Aditya Keerthi and Tim Horton. 266070@main changed the behavior of the caret color to more closely follow the spec, and improve web compat. However, this behavior change also affected HTML Notes, which sets `color` on an ancestor of the editable div. As a result, the caret color is black. However, it should match the accent color of the app it is in, if it sets a custom accent color. To fix, implement the same solution as 269314@main effectively, but on macOS. * Source/WebCore/editing/FrameSelection.cpp: (WebCore::FrameSelection::paintCaret): (WebCore::CaretBase::computeCaretColor): (WebCore::CaretBase::paintCaret const): (WebCore::DragCaretController::paintDragCaret const): * Source/WebCore/editing/FrameSelection.h: * Source/WebCore/page/Page.cpp: (WebCore::Page::setAppUsesCustomAccentColor): (WebCore::Page::appUsesCustomAccentColor const): * Source/WebCore/page/Page.h: * Source/WebCore/rendering/RenderThemeIOS.mm: (WebCore::RenderThemeIOS::autocorrectionReplacementMarkerColor const): * Source/WebCore/rendering/style/RenderStyle.h: * Source/WebKit/Shared/WebPageCreationParameters.h: * Source/WebKit/Shared/WebPageCreationParameters.serialization.in: * Source/WebKit/UIProcess/PageClient.h: * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::creationParameters): * Source/WebKit/UIProcess/mac/PageClientImplMac.h: * Source/WebKit/UIProcess/mac/PageClientImplMac.mm: (WebKit::cachedAppUsesCustomAccentColor): (WebKit::PageClientImpl::appUsesCustomAccentColor): * Source/WebKit/WebProcess/WebPage/WebPage.cpp: (WebKit::m_historyItemClient): (WebKit::WebPage::reinitializeWebPage): * Source/WebKit/WebProcess/WebPage/WebPage.h: * Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::getPlatformEditorState const): * Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::setAppUsesCustomAccentColor): Canonical link: https://commits.webkit.org/270325@main Identifier: 267815.553@safari-7617-branch
WebKit · Nov 9, 2023 · dae531d · dae531d
1 parent bbdd510
commit dae531d
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 1 deletion.
diff --git a/Source/WebCore/editing/FrameSelection.cpp b/Source/WebCore/editing/FrameSelection.cpp
@@ -1908,7 +1908,13 @@ Color CaretBase::computeCaretColor(const RenderStyle& elementStyle, const Node*
         return { };
     return elementStyle.colorResolvingCurrentColor(elementStyle.caretColor());
 #elif HAVE(REDESIGNED_TEXT_CURSOR)
-    if (elementStyle.hasAutoCaretColor() && !elementStyle.hasExplicitlySetColor()) {
+#if HAVE(APP_ACCENT_COLORS) && PLATFORM(MAC)
+    auto appUsesCustomAccentColor = node && node->document().page() && node->document().page()->appUsesCustomAccentColor();
+#else
+    auto appUsesCustomAccentColor = false;
+#endif
+
+    if (elementStyle.hasAutoCaretColor() && (!elementStyle.hasExplicitlySetColor() || appUsesCustomAccentColor)) {
 #if PLATFORM(MAC)
         auto cssColorValue = CSSValueAppleSystemControlAccent;
 #else

diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
@@ -3087,6 +3087,18 @@ Color Page::sampledPageTopColor() const
     return valueOrDefault(m_sampledPageTopColor);
 }
 
+#if HAVE(APP_ACCENT_COLORS) && PLATFORM(MAC)
+void Page::setAppUsesCustomAccentColor(bool appUsesCustomAccentColor)
+{
+    m_appUsesCustomAccentColor = appUsesCustomAccentColor;
+}
+
+bool Page::appUsesCustomAccentColor() const
+{
+    return m_appUsesCustomAccentColor;
+}
+#endif
+
 void Page::setUnderPageBackgroundColorOverride(Color&& underPageBackgroundColorOverride)
 {
     if (underPageBackgroundColorOverride == m_underPageBackgroundColorOverride)

diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
@@ -768,6 +768,11 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     WEBCORE_EXPORT Color pageExtendedBackgroundColor() const;
     WEBCORE_EXPORT Color sampledPageTopColor() const;
 
+#if HAVE(APP_ACCENT_COLORS) && PLATFORM(MAC)
+    WEBCORE_EXPORT void setAppUsesCustomAccentColor(bool);
+    WEBCORE_EXPORT bool appUsesCustomAccentColor() const;
+#endif
+
     Color underPageBackgroundColorOverride() const { return m_underPageBackgroundColorOverride; }
     WEBCORE_EXPORT void setUnderPageBackgroundColorOverride(Color&&);
 
@@ -1436,6 +1441,10 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
     Ref<BadgeClient> m_badgeClient;
 
     HashMap<RegistrableDomain, uint64_t> m_noiseInjectionHashSalts;
+
+#if HAVE(APP_ACCENT_COLORS) && PLATFORM(MAC)
+    bool m_appUsesCustomAccentColor { false };
+#endif
 };
 
 inline PageGroup& Page::group()

diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
@@ -195,6 +195,9 @@ struct WebPageCreationParameters {
 #endif
 #if HAVE(APP_ACCENT_COLORS)
     WebCore::Color accentColor;
+#if PLATFORM(MAC)
+    bool appUsesCustomAccentColor;
+#endif
 #endif
 #if USE(WPE_RENDERER)
     UnixFileDescriptor hostFileDescriptor;

diff --git a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
@@ -140,6 +140,9 @@ struct WebKit::WebPageCreationParameters {
 #if HAVE(APP_ACCENT_COLORS)
     WebCore::Color accentColor;
 #endif
+#if HAVE(APP_ACCENT_COLORS) && PLATFORM(MAC)
+    bool appUsesCustomAccentColor;
+#endif
 #if USE(WPE_RENDERER)
     UnixFileDescriptor hostFileDescriptor;
 #endif

diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
@@ -413,6 +413,9 @@ class PageClient : public CanMakeWeakPtr<PageClient> {
 
 #if HAVE(APP_ACCENT_COLORS)
     virtual WebCore::Color accentColor() = 0;
+#if PLATFORM(MAC)
+    virtual bool appUsesCustomAccentColor() = 0;
+#endif
 #endif
 
     virtual bool effectiveAppearanceIsDark() const { return false; }

diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -9448,6 +9448,9 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
 #endif
 #if HAVE(APP_ACCENT_COLORS)
     parameters.accentColor = pageClient().accentColor();
+#if PLATFORM(MAC)
+    parameters.appUsesCustomAccentColor = pageClient().appUsesCustomAccentColor();
+#endif
 #endif
     parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
     parameters.userInterfaceLayoutDirection = pageClient().userInterfaceLayoutDirection();

diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
@@ -290,6 +290,9 @@ class PageClientImpl final : public PageClientImplCocoa
 
 #if HAVE(APP_ACCENT_COLORS)
     WebCore::Color accentColor() override;
+#if PLATFORM(MAC)
+    bool appUsesCustomAccentColor() override;
+#endif
 #endif
 
 #if HAVE(TRANSLATION_UI_SERVICES) && ENABLE(CONTEXT_MENUS)

diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
@@ -1043,6 +1043,24 @@ static inline NSCorrectionResponse toCorrectionResponse(AutocorrectionResponse r
 {
     return WebCore::colorFromCocoaColor([NSApp _effectiveAccentColor]);
 }
+
+bool PageClientImpl::appUsesCustomAccentColor()
+{
+    static dispatch_once_t once;
+    static BOOL usesCustomAppAccentColor = NO;
+    dispatch_once(&once, ^{
+        NSBundle *bundleForAccentColor = [NSBundle mainBundle];
+        NSDictionary *info = [bundleForAccentColor infoDictionary];
+        NSString *accentColorName = info[@"NSAccentColorName"];
+        if ([accentColorName length])
+            usesCustomAppAccentColor = !!adoptNS([NSColor colorNamed:accentColorName bundle:bundleForAccentColor]).get();
+
+        if (!usesCustomAppAccentColor && [(accentColorName = info[@"NSAppAccentColorName"]) length])
+            usesCustomAppAccentColor = !!adoptNS([NSColor colorNamed:accentColorName bundle:bundleForAccentColor]).get();
+    });
+
+    return usesCustomAppAccentColor;
+}
 #endif
 
 #if HAVE(TRANSLATION_UI_SERVICES) && ENABLE(CONTEXT_MENUS)

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
@@ -964,6 +964,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
 
 #if HAVE(APP_ACCENT_COLORS)
     setAccentColor(parameters.accentColor);
+#if PLATFORM(MAC)
+    setAppUsesCustomAccentColor(parameters.appUsesCustomAccentColor);
+#endif
 #endif
 
     m_needsFontAttributes = parameters.needsFontAttributes;
@@ -1211,6 +1214,9 @@ void WebPage::reinitializeWebPage(WebPageCreationParameters&& parameters)
 
 #if HAVE(APP_ACCENT_COLORS)
     setAccentColor(parameters.accentColor);
+#if PLATFORM(MAC)
+    setAppUsesCustomAccentColor(parameters.appUsesCustomAccentColor);
+#endif
 #endif
 
     effectiveAppearanceDidChange(parameters.useDarkAppearance, parameters.useElevatedUserInterfaceLevel);

diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
@@ -1909,6 +1909,10 @@ class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IP
 
 #if HAVE(APP_ACCENT_COLORS)
     void setAccentColor(WebCore::Color);
+#if PLATFORM(MAC)
+    void setAppUsesCustomAccentColor(bool);
+    bool appUsesCustomAccentColor();
+#endif
 #endif
 
     void setMainFrameIsScrollable(bool);
@@ -2572,6 +2576,10 @@ class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IP
     bool m_useSceneKitForModel { false };
 #endif
 
+#if HAVE(APP_ACCENT_COLORS)
+    bool m_appUsesCustomAccentColor { false };
+#endif
+
     bool m_textManipulationIncludesSubframes { false };
     std::optional<Vector<WebCore::TextManipulationController::ExclusionRule>> m_textManipulationExclusionRules;
 

diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
@@ -1105,6 +1105,13 @@ static void drawPDFPage(PDFDocument *pdfDocument, CFIndex pageIndex, CGContextRe
     [NSApp _setAccentColor:cocoaColorOrNil(color).get()];
 }
 
+#if PLATFORM(MAC)
+void WebPage::setAppUsesCustomAccentColor(bool appUsesCustomAccentColor)
+{
+    corePage()->setAppUsesCustomAccentColor(appUsesCustomAccentColor);
+}
+#endif
+
 #endif // HAVE(APP_ACCENT_COLORS)
 
 void WebPage::zoomPDFIn(PDFPluginIdentifier identifier)