Changeset 284755 in webkit

Timestamp:

Oct 24, 2021 7:50:04 AM (9 months ago)

Author:

commit-queue@webkit.org

Message:

[css-contain] Support contain:style for counters
​https://bugs.webkit.org/show_bug.cgi?id=226458

Patch by Rob Buis <​rbuis@igalia.com> on 2021-10-24
Reviewed by Antti Koivisto.

Remove unneeded logic from r284642 change.

• rendering/RenderCounter.cpp:

(WebCore::previousInPreOrder):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-24  Rob Buis  <rbuis@igalia.com>
+
+        [css-contain] Support contain:style for counters
+        https://bugs.webkit.org/show_bug.cgi?id=226458
+
+        Reviewed by Antti Koivisto.
+
+        Remove unneeded logic from r284642 change.
+
+        * rendering/RenderCounter.cpp:
+        (WebCore::previousInPreOrder):
+
 2021-10-23  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/rendering/RenderCounter.cpp

@@ -80 +80 @@
     Element* styleContainAncestor = ancestorStyleContainmentObject(*renderer.element());
 
-    while (true) {
-        while (previous && !previous->renderer())
-            previous = ElementTraversal::previousIncludingPseudo(*previous, styleContainAncestor);
-        if (!previous)
-            return nullptr;
-        Element* previousStyleContainAncestor = ancestorStyleContainmentObject(*previous);
-        if (previousStyleContainAncestor == styleContainAncestor)
-            return previous->renderer();
-        if (!previousStyleContainAncestor)
-            return nullptr;
-        previous = previousStyleContainAncestor;
-    }
+    while (previous && !previous->renderer())
+        previous = ElementTraversal::previousIncludingPseudo(*previous, styleContainAncestor);
+    if (!previous)
+        return nullptr;
+    return previous->renderer();
 }