Attachment #442303 for bug #226458

View Details Raw Unified Return to Bug 226458

| Differences between



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 NOBODY (OOPS!).

        Remove unneeded logic from r284642 change.

        * rendering/RenderCounter.cpp:
        (WebCore::previousInPreOrder):

2021-10-23  Rob Buis  <rbuis@igalia.com>

        Null check in traverseNodesForSerialization



    Element* previous = ElementTraversal::previousIncludingPseudo(*renderer.element());
    Element* styleContainAncestor = ancestorStyleContainmentObject(*renderer.element());

    while (previous && !previous->renderer())
        previous = ElementTraversal::previousIncludingPseudo(*previous, styleContainAncestor);
    if (!previous)
        return nullptr;
    return previous->renderer();
        Element* previousStyleContainAncestor = ancestorStyleContainmentObject(*previous);
        if (previousStyleContainAncestor == styleContainAncestor)
            return previous->renderer();
        if (!previousStyleContainAncestor)
            return nullptr;
        previous = previousStyleContainAncestor;
    }
}

static inline Element* parentOrPseudoHostElement(const RenderElement& renderer)

Return to Bug 226458

Lines 79-96 static RenderElement* previousInPreOrder(const RenderElement& renderer) a/Source/WebCore/rendering/RenderCounter.cpp_sec1
- a/Source/WebCore/rendering/RenderCounter.cpp -12 / +5 lines
79	Element* previous = ElementTraversal::previousIncludingPseudo(*renderer.element());	79	Element* previous = ElementTraversal::previousIncludingPseudo(*renderer.element());
80	Element* styleContainAncestor = ancestorStyleContainmentObject(*renderer.element());	80	Element* styleContainAncestor = ancestorStyleContainmentObject(*renderer.element());
81		81
82	while (true) {	82	while (previous && !previous->renderer())
83	while (previous && !previous->renderer())	83	previous = ElementTraversal::previousIncludingPseudo(*previous, styleContainAncestor);
84	previous = ElementTraversal::previousIncludingPseudo(*previous, styleContainAncestor);	84	if (!previous)
85	if (!previous)	85	return nullptr;
86	return nullptr;	86	return previous->renderer();
87	Element* previousStyleContainAncestor = ancestorStyleContainmentObject(*previous);
88	if (previousStyleContainAncestor == styleContainAncestor)
89	return previous->renderer();
90	if (!previousStyleContainAncestor)
91	return nullptr;
92	previous = previousStyleContainAncestor;
93	}
94	}	87	}
95		88
96	static inline Element* parentOrPseudoHostElement(const RenderElement& renderer)	89	static inline Element* parentOrPseudoHostElement(const RenderElement& renderer)

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +12 lines
		1	2021-10-24 Rob Buis <rbuis@igalia.com>
		2
		3	[css-contain] Support contain:style for counters
		4	https://bugs.webkit.org/show_bug.cgi?id=226458
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Remove unneeded logic from r284642 change.
		9
		10	* rendering/RenderCounter.cpp:
		11	(WebCore::previousInPreOrder):
		12
1	2021-10-23 Rob Buis <rbuis@igalia.com>	13	2021-10-23 Rob Buis <rbuis@igalia.com>
2		14
3	Null check in traverseNodesForSerialization	15	Null check in traverseNodesForSerialization