Changeset 248346 in webkit

Timestamp:

Aug 6, 2019, 11:52:22 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r247756. rdar://problem/54017897

Long press hint has half blue shape in Feedly.com
​https://bugs.webkit.org/show_bug.cgi?id=200053
<rdar://problem/53323369>

Reviewed by Simon Fraser.

No new tests, because TextIndicator snapshots are not yet testable.

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::paintForegroundForFragments): Paint ChildBlockBackgrounds when painting selection AND backgrounds; only exclude it when doing a selection-only paint.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@247756 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)

branches/safari-608.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r247756. rdar://problem/54017897
+
+    Long press hint has half blue shape in Feedly.com
+    https://bugs.webkit.org/show_bug.cgi?id=200053
+    <rdar://problem/53323369>
+    
+    Reviewed by Simon Fraser.
+    
+    No new tests, because TextIndicator snapshots are not yet testable.
+    
+    * rendering/RenderLayer.cpp:
+    (WebCore::RenderLayer::paintForegroundForFragments):
+    Paint ChildBlockBackgrounds when painting selection AND backgrounds;
+    only exclude it when doing a selection-only paint.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247756 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-23  Tim Horton  <timothy_horton@apple.com>
+
+            Long press hint has half blue shape in Feedly.com
+            https://bugs.webkit.org/show_bug.cgi?id=200053
+            <rdar://problem/53323369>
+
+            Reviewed by Simon Fraser.
+
+            No new tests, because TextIndicator snapshots are not yet testable.
+
+            * rendering/RenderLayer.cpp:
+            (WebCore::RenderLayer::paintForegroundForFragments):
+            Paint ChildBlockBackgrounds when painting selection AND backgrounds;
+            only exclude it when doing a selection-only paint.
+
 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebCore/rendering/RenderLayer.cpp

@@ -4901 +4901 @@
     // We have to loop through every fragment multiple times, since we have to repaint in each specific phase in order for
     // interleaving of the fragments to work properly.
-    bool selectionOnly = localPaintingInfo.paintBehavior.containsAny({ PaintBehavior::SelectionAndBackgroundsOnly, PaintBehavior::SelectionOnly });
-    paintForegroundForFragmentsWithPhase(selectionOnly ? PaintPhase::Selection : PaintPhase::ChildBlockBackgrounds, layerFragments,
-        context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
-    
-    if (!selectionOnly) {
+    bool selectionOnly = localPaintingInfo.paintBehavior.contains(PaintBehavior::SelectionOnly);
+    bool selectionAndBackgroundsOnly = localPaintingInfo.paintBehavior.contains(PaintBehavior::SelectionAndBackgroundsOnly);
+
+    if (!selectionOnly)
+        paintForegroundForFragmentsWithPhase(PaintPhase::ChildBlockBackgrounds, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
+
+    if (selectionOnly || selectionAndBackgroundsOnly)
+        paintForegroundForFragmentsWithPhase(PaintPhase::Selection, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
+    else {
         paintForegroundForFragmentsWithPhase(PaintPhase::Float, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);
         paintForegroundForFragmentsWithPhase(PaintPhase::Foreground, layerFragments, context, localPaintingInfo, localPaintBehavior, subtreePaintRootForRenderer);