[webkit-changes] [WebKit/WebKit] 96f9d0: Marked text does not honor foreground color when s...

[Richard Robinson]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 96f9d0c2e5a5ddbd7421e225fa514c7c2073a61a
      https://github.com/WebKit/WebKit/commit/96f9d0c2e5a5ddbd7421e225fa514c7c2073a61a
  Author: Richard Robinson <richard_robinson2 at apple.com>
  Date:   2023-03-03 (Fri, 03 Mar 2023)

  Changed paths:
    M Source/WebCore/rendering/TextBoxPainter.cpp
    M Source/WebCore/rendering/TextBoxPainter.h

  Log Message:
  -----------
  Marked text does not honor foreground color when spellchecking is on
https://bugs.webkit.org/show_bug.cgi?id=253283
rdar://106127073

Reviewed by Aditya Keerthi and Antti Koivisto.

When spellchecking is on, `m_document.markers().hasMarkers()` is `true`, which
meant that `contentMayNeedStyledMarkedText` is `true`, resulting in `paintCompositionForeground`
never getting called and so the composition was never being applied.

This PR fixes this by calling `paintCompositionForeground` in all call sites where
`paintComposition` was called previously, and then if there is no composition, it
just calls `paintForeground` normally like before.

* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::TextBoxPainter<TextBoxPath>::paintCompositionForeground):
(WebCore::TextBoxPainter<TextBoxPath>::paintForegroundAndDecorations):
* Source/WebCore/rendering/TextBoxPainter.h:

Canonical link: https://commits.webkit.org/261170@main