Attachment 340219 Details for Bug 185551 – Patch

[patch] Patch

bug-185551-20180511134448.patch (text/plain), 2.58 KB, created by Daniel Bates on 2018-05-11 13:44:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-05-11 13:44:48 PDT

Size: 2.58 KB

patch

obsolete

>Subversion Revision: 231707
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bb3e5a42c7b9deb1f1f0070d6554b126ff494603..2dc9d60260c227bb4692e653a249c974c5d053db 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-11  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS] Text decoration of dragged content does not paint with opacity
>+        https://bugs.webkit.org/show_bug.cgi?id=185551
>+        <rdar://problem/40166867>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Respect alpha when painting the text decoration for dragged content.
>+
>+        * rendering/InlineTextBox.cpp:
>+        (WebCore::InlineTextBox::MarkedTextStyle::areDecorationMarkedTextStylesEqual): Consider alpha when
>+        comparing decoration styles for equality so that we do not coalesce styles with differing alpha.
>+        (WebCore::InlineTextBox::paintMarkedTextDecoration): Respect alpha when painting dragged content.
>+
> 2018-05-11  Brady Eidson  <beidson@apple.com>
> 
>         Make sure history navigations reuse the existing process when necessary.
>diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp
>index 5a859bbd30779ddf37b8b867675fde57caa8816b..58ff79853bddd207c7628fe7db77fac299d1d359 100644
>--- a/Source/WebCore/rendering/InlineTextBox.cpp
>+++ b/Source/WebCore/rendering/InlineTextBox.cpp
>@@ -403,7 +403,7 @@ struct InlineTextBox::MarkedTextStyle {
>     }
>     static bool areDecorationMarkedTextStylesEqual(const MarkedTextStyle& a, const MarkedTextStyle& b)
>     {
>-        return a.textDecorationStyles == b.textDecorationStyles && a.textShadow == b.textShadow;
>+        return a.textDecorationStyles == b.textDecorationStyles && a.textShadow == b.textShadow && a.alpha == b.alpha;
>     }
> 
>     Color backgroundColor;
>@@ -1075,9 +1075,13 @@ void InlineTextBox::paintMarkedTextDecoration(PaintInfo& paintInfo, const FloatR
> 
>     {
>         GraphicsContextStateSaver stateSaver { context, false };
>-        if (!clipOutRect.isEmpty()) {
>+        bool isDraggedContent = markedText.type == MarkedText::DraggedContent;
>+        if (isDraggedContent || !clipOutRect.isEmpty()) {
>             stateSaver.save();
>-            context.clipOut(clipOutRect);
>+            if (isDraggedContent)
>+                context.setAlpha(markedText.style.alpha);
>+            if (!clipOutRect.isEmpty())
>+                context.clipOut(clipOutRect);
>         }
>         decorationPainter.paintTextDecoration(textRun.subRun(startOffset, endOffset - startOffset), textOriginFromBoxRect(snappedSelectionRect), snappedSelectionRect.location());
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 185551: 340219