Changeset 259031 in webkit

Timestamp:

Mar 25, 2020, 9:28:40 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[ macOS ] svg/custom/textPath-change-id-pattern.svg is flakey failing
​https://bugs.webkit.org/show_bug.cgi?id=208532

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2020-03-25
Reviewed by Darin Adler.

Source/WebCore:

In this layout test, the id of a <path> element changes. This <path> is
referenced by a <textPath> element which is a child of a <pattern> element.
The <pattern> element is used to fill a <rect> element.

This patch ensures all clients (<rect>) of the resource ancestor (<pattern>)
of any sub-resource (<textPath>) is marked for repaint when the id of a
sub-sub-resource (<path>) changes.

• rendering/svg/RenderSVGResourceContainer.cpp:

(WebCore::RenderSVGResourceContainer::markAllClientsForRepaint):

• rendering/svg/RenderSVGResourceContainer.h:
• svg/SVGElement.cpp:

(WebCore::SVGElement::buildPendingResourcesIfNeeded):
(WebCore::SVGElement::invalidateInstances):
Unrelated change. This is a leftover from r179807 which was converting a
"do { } while();" statement to "while() { }" statement.

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (modified) (1 diff)
• Source/WebCore/svg/SVGElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [ macOS ] svg/custom/textPath-change-id-pattern.svg is flakey failing
+        https://bugs.webkit.org/show_bug.cgi?id=208532
+
+        Reviewed by Darin Adler.
+
+        * platform/mac-wk1/TestExpectations:
+
 2020-03-25  Jack Lee  <shihchieh_lee@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -944 +944 @@
 webkit.org/b/209480 [ Debug ] webgl/2.0.0/conformance/attribs/gl-vertexattribpointer.html [ Pass Timeout ]
 
-webkit.org/b/208532 svg/custom/textPath-change-id-pattern.svg [ Pass Failure ]
-
 webkit.org/b/208825 [ Debug ] inspector/script-profiler/event-type-Microtask.html [ Pass Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-25  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [ macOS ] svg/custom/textPath-change-id-pattern.svg is flakey failing
+        https://bugs.webkit.org/show_bug.cgi?id=208532
+
+        Reviewed by Darin Adler.
+
+        In this layout test, the id of a <path> element changes. This <path> is
+        referenced by a <textPath> element which is a child of a <pattern> element.
+        The <pattern> element is used to fill a <rect> element.
+
+        This patch ensures all clients (<rect>) of the resource ancestor (<pattern>)
+        of any sub-resource (<textPath>) is marked for repaint when the id of a
+        sub-sub-resource (<path>) changes.
+
+        * rendering/svg/RenderSVGResourceContainer.cpp:
+        (WebCore::RenderSVGResourceContainer::markAllClientsForRepaint):
+        * rendering/svg/RenderSVGResourceContainer.h:
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::buildPendingResourcesIfNeeded):
+        (WebCore::SVGElement::invalidateInstances):
+        Unrelated change. This is a leftover from r179807 which was converting a
+        "do { } while();" statement to "while() { }" statement.
+
 2020-03-25  Jack Lee  <shihchieh_lee@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

@@ -91 +91 @@
 }
 
+void RenderSVGResourceContainer::markAllClientsForRepaint()
+{
+    markAllClientsForInvalidation(RepaintInvalidation);
+}
+
 void RenderSVGResourceContainer::markAllClientsForInvalidation(InvalidationMode mode)
 {

trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h

@@ -43 +43 @@
 
     void idChanged();
+    void markAllClientsForRepaint();
     void addClientRenderLayer(RenderLayer*);
     void removeClientRenderLayer(RenderLayer*);

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -35 +35 @@
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
+#include "RenderAncestorIterator.h"
 #include "RenderSVGResourceFilter.h"
 #include "RenderSVGResourceMasker.h"
@@ -868 +869 @@
         if (clientElement->hasPendingResources()) {
             clientElement->buildPendingResource();
+            if (auto renderer = clientElement->renderer()) {
+                for (auto& ancestor : ancestorsOfType<RenderSVGResourceContainer>(*renderer))
+                    ancestor.markAllClientsForRepaint();
+            }
             extensions.clearHasPendingResourcesIfPossible(*clientElement);
         }
@@ -947 +952 @@
             useElement->invalidateShadowTree();
         instance->setCorrespondingElement(nullptr);
-    } while (!instances.isEmpty());
-}
-
-}
+    }
+}
+
+}