Changeset 267528 in webkit

Timestamp:

Sep 24, 2020, 6:21:13 AM (6 years ago)

Author:

Antti Koivisto

Message:

currentColor isn't recalculated when a text node doesn't exist
​https://bugs.webkit.org/show_bug.cgi?id=216780
<rdar://problem/69320933>

Reviewed by Antoine Quint.

Source/WebCore:

We fail to repaint with the new background color when 'background-color' property has value 'currentColor' and the current color changes.

Test case by Cory LaViska.

Test: fast/css/currentColor-background-paint.html

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresRepaint const):

• rendering/style/StyleBackgroundData.cpp:

(WebCore::StyleBackgroundData::isEquivalentForPainting const):

• rendering/style/StyleBackgroundData.h:

LayoutTests:

• fast/css/currentColor-background-paint-expected.html: Added.
• fast/css/currentColor-background-paint.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/currentColor-background-paint-expected.html (added)
• LayoutTests/fast/css/currentColor-background-paint.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/StyleBackgroundData.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/StyleBackgroundData.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-24  Antti Koivisto  <antti@apple.com>
+
+        currentColor isn't recalculated when a text node doesn't exist
+        https://bugs.webkit.org/show_bug.cgi?id=216780
+        <rdar://problem/69320933>
+
+        Reviewed by Antoine Quint.
+
+        * fast/css/currentColor-background-paint-expected.html: Added.
+        * fast/css/currentColor-background-paint.html: Added.
+
 2020-09-24  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-24  Antti Koivisto  <antti@apple.com>
+
+        currentColor isn't recalculated when a text node doesn't exist
+        https://bugs.webkit.org/show_bug.cgi?id=216780
+        <rdar://problem/69320933>
+
+        Reviewed by Antoine Quint.
+
+        We fail to repaint with the new background color when 'background-color' property has value 'currentColor' and the current color changes.
+
+        Test case by Cory LaViska.
+
+        Test: fast/css/currentColor-background-paint.html
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresRepaint const):
+        * rendering/style/StyleBackgroundData.cpp:
+        (WebCore::StyleBackgroundData::isEquivalentForPainting const):
+        * rendering/style/StyleBackgroundData.h:
+
 2020-09-24  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -1116 +1116 @@
         return false;
 
+    bool currentColorDiffers = m_inheritedData->color != other.m_inheritedData->color;
+
     if (m_inheritedFlags.visibility != other.m_inheritedFlags.visibility
         || m_inheritedFlags.printColorAdjust != other.m_inheritedFlags.printColorAdjust
@@ -1121 +1123 @@
         || m_inheritedFlags.insideDefaultButton != other.m_inheritedFlags.insideDefaultButton
         || m_surroundData->border != other.m_surroundData->border
-        || !m_backgroundData->isEquivalentForPainting(*other.m_backgroundData))
+        || !m_backgroundData->isEquivalentForPainting(*other.m_backgroundData, currentColorDiffers))
         return true;
 

trunk/Source/WebCore/rendering/style/StyleBackgroundData.cpp

@@ -52 +52 @@
 }
 
-bool StyleBackgroundData::isEquivalentForPainting(const StyleBackgroundData& other) const
+bool StyleBackgroundData::isEquivalentForPainting(const StyleBackgroundData& other, bool currentColorDiffers) const
 {
     if (background != other.background || color != other.color)
         return false;
+    if (currentColorDiffers && color == RenderStyle::currentColor())
+        return false;
     if (!outline.isVisible() && !other.outline.isVisible())
         return true;
+    if (currentColorDiffers && outline.color() == RenderStyle::currentColor())
+        return false;
     return outline == other.outline;
 }

trunk/Source/WebCore/rendering/style/StyleBackgroundData.h

@@ -42 +42 @@
     bool operator!=(const StyleBackgroundData& other) const { return !(*this == other); }
 
-    bool isEquivalentForPainting(const StyleBackgroundData&) const;
+    bool isEquivalentForPainting(const StyleBackgroundData&, bool currentColorDiffers) const;
 
     DataRef<FillLayer> background;