Changeset 256360 in webkit

Timestamp:

Feb 11, 2020 1:53:01 PM (4 years ago)

Author:

Megan Gardner

Message:

Draw underlines when specified in highlights
​https://bugs.webkit.org/show_bug.cgi?id=207319

Reviewed by Simon Fraser.

Source/WebCore:

Test: http/wpt/css/css-highlight-api/highlight-text-decorations.html

When determining if we have any text decorations, currently we were only looking at the lineStyle,
but since highlights can have text decorations, they need to be considered in these calculations.

• dom/Document.cpp:

(WebCore::Document::updateHighlightPositions):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::collectMarkedTextsForHighlights const):
(WebCore::InlineTextBox::paintMarkedTextDecoration):

• rendering/TextDecorationPainter.cpp:

(WebCore::TextDecorationPainter::textDecorationsInEffectForStyle):

• rendering/TextDecorationPainter.h:

LayoutTests:

• http/wpt/css/css-highlight-api/highlight-text-decorations-expected.html: Copied from LayoutTests/http/wpt/css/css-highlight-api/highlight-text-expected.html.
• http/wpt/css/css-highlight-api/highlight-text-decorations.html: Added.
• http/wpt/css/css-highlight-api/highlight-text-expected.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/css/css-highlight-api/highlight-text-decorations-expected.html (added)
• LayoutTests/http/wpt/css/css-highlight-api/highlight-text-decorations.html (added)
• LayoutTests/platform/win/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/InlineTextBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/TextDecorationPainter.cpp (modified) (1 diff)
• Source/WebCore/rendering/TextDecorationPainter.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-02-11  Megan Gardner  <megan_gardner@apple.com>
+
+        Draw underlines when specified in highlights
+        https://bugs.webkit.org/show_bug.cgi?id=207319
+
+        Reviewed by Simon Fraser.
+
+        * http/wpt/css/css-highlight-api/highlight-text-decorations-expected.html: Copied from LayoutTests/http/wpt/css/css-highlight-api/highlight-text-expected.html.
+        * http/wpt/css/css-highlight-api/highlight-text-decorations.html: Added.
+        * http/wpt/css/css-highlight-api/highlight-text-expected.html:
+
 2020-02-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -406 +406 @@
 # highlight API
 highlight/ [ Skip ]
+http/wpt/css/css-highlight-api/ [ Skip ]
 
 # Pre-HMTL5 parser quirks only apply to the mac port for now.
@@ -4520 +4521 @@
 webkit.org/b/206282 fast/text/stale-TextLayout-from-first-line.html [ ImageOnlyFailure ]
 
-webkit.org/b/205855 http/wpt/css/css-highlight-api/highlight-text-across-elements.html [ ImageOnlyFailure ]
-webkit.org/b/205855 http/wpt/css/css-highlight-api/highlight-text-cascade.html [ ImageOnlyFailure ]
-webkit.org/b/205855 http/wpt/css/css-highlight-api/highlight-text-replace.html [ ImageOnlyFailure ]
-webkit.org/b/205855 http/wpt/css/css-highlight-api/highlight-text.html [ ImageOnlyFailure ]
-
 webkit.org/b/205856 storage/indexeddb/IDBTransaction-page-cache.html [ Pass Timeout ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-11  Megan Gardner  <megan_gardner@apple.com>
+
+        Draw underlines when specified in highlights
+        https://bugs.webkit.org/show_bug.cgi?id=207319
+
+        Reviewed by Simon Fraser.
+
+        Test: http/wpt/css/css-highlight-api/highlight-text-decorations.html
+
+        When determining if we have any text decorations, currently we were only looking at the lineStyle,
+        but since highlights can have text decorations, they need to be considered in these calculations.
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateHighlightPositions):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paint):
+        (WebCore::InlineTextBox::collectMarkedTextsForHighlights const):
+        (WebCore::InlineTextBox::paintMarkedTextDecoration):
+        * rendering/TextDecorationPainter.cpp:
+        (WebCore::TextDecorationPainter::textDecorationsInEffectForStyle):
+        * rendering/TextDecorationPainter.h:
+
 2020-02-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -623 +623 @@
     // Paint decorations
     auto textDecorations = lineStyle.textDecorationsInEffect();
-    if (!textDecorations.isEmpty() && paintInfo.phase != PaintPhase::Selection) {
+    bool highlightDecorations = !collectMarkedTextsForHighlights(TextPaintPhase::Decoration).isEmpty();
+    bool lineDecorations = !textDecorations.isEmpty();
+    if ((lineDecorations || highlightDecorations) && paintInfo.phase != PaintPhase::Selection) {
         TextRun textRun = createTextRun();
         unsigned length = textRun.length();
@@ -1045 +1047 @@
         if (!renderStyle)
             continue;
+        if (renderStyle->textDecorationsInEffect().isEmpty() && phase == TextPaintPhase::Decoration)
+            continue;
         for (auto& rangeData : highlight.value->rangesData()) {
             if (rangeData->startPosition && rangeData->endPosition) {
@@ -1197 +1201 @@
 
     // 2. Paint
-    TextDecorationPainter decorationPainter { context, lineStyle().textDecorationsInEffect(), renderer(), isFirstLine(), lineFont(), markedText.style.textDecorationStyles };
+    auto textDecorations = lineStyle().textDecorationsInEffect();
+    textDecorations.add(TextDecorationPainter::textDecorationsInEffectForStyle(markedText.style.textDecorationStyles));
+    TextDecorationPainter decorationPainter { context, textDecorations, renderer(), isFirstLine(), lineFont(), markedText.style.textDecorationStyles };
     decorationPainter.setInlineTextBox(this);
     decorationPainter.setWidth(snappedSelectionRect.width());

trunk/Source/WebCore/rendering/TextDecorationPainter.cpp

@@ -388 +388 @@
 }
 
+OptionSet<TextDecoration> TextDecorationPainter::textDecorationsInEffectForStyle(const TextDecorationPainter::Styles& style)
+{
+    OptionSet<TextDecoration> decorations;
+    if (style.underlineColor.isValid())
+        decorations.add(TextDecoration::Underline);
+    if (style.overlineColor.isValid())
+        decorations.add(TextDecoration::Overline);
+    if (style.linethroughColor.isValid())
+        decorations.add(TextDecoration::LineThrough);
+    return decorations;
+};
+
 auto TextDecorationPainter::stylesForRenderer(const RenderObject& renderer, OptionSet<TextDecoration> requestedDecorations, bool firstLineStyle, PseudoId pseudoId) -> Styles
 {

trunk/Source/WebCore/rendering/TextDecorationPainter.h

@@ -65 +65 @@
         TextDecorationStyle linethroughStyle;
     };
+    static OptionSet<TextDecoration> textDecorationsInEffectForStyle(const Styles&);
     static Styles stylesForRenderer(const RenderObject&, OptionSet<TextDecoration> requestedDecorations, bool firstLineStyle = false, PseudoId = PseudoId::None);