Attachment 343867 Details for Bug 187161 – Patch

[patch] Patch

bug-187161-20180628155341.patch (text/plain), 2.02 KB, created by Timothy Hatcher on 2018-06-28 15:53:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2018-06-28 15:53:43 PDT

Size: 2.02 KB

patch

obsolete

>Subversion Revision: 233314
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 469e7ea40c4f551e2ac82695b8448077495476b8..3bbc2f6f34c93033f8401467c09ce7fc44e5b6ba 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-06-28  Timothy Hatcher  <timothy@apple.com>
>+
>+        Don't force black text when TextIndicator draws backgrounds or all content.
>+        https://bugs.webkit.org/show_bug.cgi?id=187161
>+        rdar://problem/40434644
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * page/TextIndicator.cpp:
>+        (WebCore::snapshotOptionsForTextIndicatorOptions):
>+        Only set SnapshotOptionsForceBlackText when TextIndicatorOptionRespectTextColor and
>+        TextIndicatorOptionPaintBackgrounds are not set.
>+
> 2018-06-28  Aditya Keerthi  <akeerthi@apple.com>
> 
>         REGRESSION (r232040): Cursor jumping in Safari text fields
>diff --git a/Source/WebCore/page/TextIndicator.cpp b/Source/WebCore/page/TextIndicator.cpp
>index 7954651185d9e35e5e2aee2d2ef89f6f5c08a5cb..611585d2d2719dea34f5903f0ca57ca036f2aa47 100644
>--- a/Source/WebCore/page/TextIndicator.cpp
>+++ b/Source/WebCore/page/TextIndicator.cpp
>@@ -134,14 +134,16 @@ static bool hasNonInlineOrReplacedElements(const Range& range)
> static SnapshotOptions snapshotOptionsForTextIndicatorOptions(TextIndicatorOptions options)
> {
>     SnapshotOptions snapshotOptions = SnapshotOptionsNone;
>-    if (!(options & TextIndicatorOptionRespectTextColor))
>-        snapshotOptions |= SnapshotOptionsForceBlackText;
> 
>     if (!(options & TextIndicatorOptionPaintAllContent)) {
>         if (options & TextIndicatorOptionPaintBackgrounds)
>             snapshotOptions |= SnapshotOptionsPaintSelectionAndBackgroundsOnly;
>-        else
>+        else {
>             snapshotOptions |= SnapshotOptionsPaintSelectionOnly;
>+
>+            if (!(options & TextIndicatorOptionRespectTextColor))
>+                snapshotOptions |= SnapshotOptionsForceBlackText;
>+        }
>     } else
>         snapshotOptions |= SnapshotOptionsExcludeSelectionHighlighting;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187161: 343867