Changeset 275607 in webkit

Timestamp:

Apr 7, 2021 8:54:58 AM (3 years ago)

Author:

Alan Bujtas

Message:

REGRESSION (r270849): Button content fails to render on apple.com "Blood Oxygen"/"ECG"
​https://bugs.webkit.org/show_bug.cgi?id=224261

Reviewed by Simon Fraser.

Source/WebCore:

1. The changeRequiresRecompositeLayer check in RenderStyle::diff should come after

changeRequiresRepaintIfTextOrBorderOrOutline since RepaintIfTextOrBorderOrOutline is at
a higher priority in StyleDifference.

2. Ensure that we trigger setNeedsCompositingConfigurationUpdate on diff >= StyleDifference::RecompositeLayer.

Test: fast/text/text-repaint-when-pointer-event-property-changes.html

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::layerStyleChanged):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff const):

LayoutTests:

• fast/text/text-repaint-when-pointer-event-property-changes-expected.html: Added.
• fast/text/text-repaint-when-pointer-event-property-changes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/text-repaint-when-pointer-event-property-changes-expected.html (added)
• LayoutTests/fast/text/text-repaint-when-pointer-event-property-changes.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-07  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r270849): Button content fails to render on apple.com "Blood Oxygen"/"ECG"
+        https://bugs.webkit.org/show_bug.cgi?id=224261
+
+        Reviewed by Simon Fraser.
+
+        * fast/text/text-repaint-when-pointer-event-property-changes-expected.html: Added.
+        * fast/text/text-repaint-when-pointer-event-property-changes.html: Added.
+
 2021-04-07  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-07  Zalan Bujtas  <zalan@apple.com>
+
+        REGRESSION (r270849): Button content fails to render on apple.com "Blood Oxygen"/"ECG"
+        https://bugs.webkit.org/show_bug.cgi?id=224261
+
+        Reviewed by Simon Fraser.
+
+        1. The changeRequiresRecompositeLayer check in RenderStyle::diff should come after
+        changeRequiresRepaintIfTextOrBorderOrOutline since RepaintIfTextOrBorderOrOutline is at
+        a higher priority in StyleDifference.
+        2. Ensure that we trigger setNeedsCompositingConfigurationUpdate on diff >= StyleDifference::RecompositeLayer.
+
+        Test: fast/text/text-repaint-when-pointer-event-property-changes.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::layerStyleChanged):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff const):
+
 2021-04-07  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1688 +1688 @@
     }
 
-    if (diff == StyleDifference::RecompositeLayer && layer.isComposited()) {
-        if (oldStyle && oldStyle->pointerEvents() != newStyle.pointerEvents())
-            layer.setNeedsCompositingConfigurationUpdate();
-        else if (is<RenderWidget>(layer.renderer())) {
-            // This is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
-            layer.setNeedsCompositingConfigurationUpdate();
-        }
-    }
-
-    if (diff >= StyleDifference::RecompositeLayer && oldStyle && recompositeChangeRequiresGeometryUpdate(*oldStyle, newStyle)) {
-        // FIXME: transform changes really need to trigger layout. See RenderElement::adjustStyleDifference().
-        layer.setNeedsPostLayoutCompositingUpdate();
-        layer.setNeedsCompositingGeometryUpdate();
+    if (diff >= StyleDifference::RecompositeLayer) {
+        if (layer.isComposited()) {
+            if (is<RenderWidget>(layer.renderer()) || (oldStyle && oldStyle->pointerEvents() != newStyle.pointerEvents())) {
+                // For RenderWidgets this is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
+                layer.setNeedsCompositingConfigurationUpdate();
+            }
+        }
+        if (oldStyle && recompositeChangeRequiresGeometryUpdate(*oldStyle, newStyle)) {
+            // FIXME: transform changes really need to trigger layout. See RenderElement::adjustStyleDifference().
+            layer.setNeedsPostLayoutCompositingUpdate();
+            layer.setNeedsCompositingGeometryUpdate();
+        }
     }
 }

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

@@ -1216 +1216 @@
         return StyleDifference::Repaint;
 
+    if (changeRequiresRepaintIfTextOrBorderOrOutline(other, changedContextSensitiveProperties))
+        return StyleDifference::RepaintIfTextOrBorderOrOutline;
+
+    // FIXME: RecompositeLayer should also behave as a priority bit (e.g when the style change requires layout, we know that
+    // the content also needs repaint and it will eventually get repainted,
+    // but a repaint type of change (e.g. color change) does not necessarily trigger recomposition). 
     if (changeRequiresRecompositeLayer(other, changedContextSensitiveProperties))
         return StyleDifference::RecompositeLayer;
-
-    if (changeRequiresRepaintIfTextOrBorderOrOutline(other, changedContextSensitiveProperties))
-        return StyleDifference::RepaintIfTextOrBorderOrOutline;
 
     // Cursors are not checked, since they will be set appropriately in response to mouse events,