Add an iterator for the StyleProperties family of classes #6981

weinig · 2022-11-30T20:12:29Z

`bd076ef`

Add an iterator for the StyleProperties family of classes
https://bugs.webkit.org/show_bug.cgi?id=248546
rdar://102823936

Reviewed by Antoine Quint.

Add iterator support for StyleProperties, ImmutableStyleProperties
and MutableStyleProperties to allow iterating through the stored
properties using for-in as well generic algorithms.

* Source/WTF/wtf/Vector.h:
(WTF::Mapper::map):
(WTF::CompactMapper::compactMap):
(WTF::copyToVectorSpecialization):
Use a universal reference to allow iterators that return temporaries
(like the one for StyleProperties) to work with the mapping code.

* Source/WebCore/animation/KeyframeEffect.cpp:
(WebCore::KeyframeEffect::computeHasImplicitKeyframeForAcceleratedProperty):
(WebCore::KeyframeEffect::computeHasKeyframeComposingAcceleratedProperty):
Adopt range-based for loop using the new iterator.

* Source/WebCore/css/CSSValueList.cpp:
(WebCore::CSSValueList::removeAll):
(WebCore::CSSValueList::hasValue const):
* Source/WebCore/css/CSSValueList.h:
Remove versions of removeAll() and hasValue() taking a nullable CSSValue*,
and replace them with overloads that take either a CSSValue& or a CSSValueID.
The CSSValueID allows us to check use without allocation or pool lookup.

* Source/WebCore/css/ComputedStyleExtractor.cpp:
(WebCore::ComputedStyleExtractor::fontVariantShorthandValue):
(WebCore::ComputedStyleExtractor::getCSSPropertyValuesForShorthandProperties):
(WebCore::ComputedStyleExtractor::getCSSPropertyValuesForGridShorthand):
Adopt range-based for loop using existing shorthand iterator support. Use
isValueID helper to simplify a condition.

* Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp:
(WebCore::PropertySetCSSStyleDeclaration::length const):
Adopt range-based for loop using the new iterator.

* Source/WebCore/css/StyleProperties.cpp:
(WebCore::MutableStyleProperties::MutableStyleProperties):
(WebCore::StyleProperties::commonShorthandChecks const):
(WebCore::StyleProperties::asTextInternal const):
(WebCore::MutableStyleProperties::mergeAndOverrideOnConflict):
(WebCore::StyleProperties::traverseSubresources const):
* Source/WebCore/css/StyleProperties.h:
(WebCore::StyleProperties::Iterator::Iterator):
(WebCore::StyleProperties::Iterator::operator* const):
(WebCore::StyleProperties::Iterator::operator++):
(WebCore::StyleProperties::Iterator::operator== const):
(WebCore::StyleProperties::Iterator::operator!= const):
(WebCore::StyleProperties::begin const):
(WebCore::StyleProperties::end):
(WebCore::StyleProperties::size const):
Adds and adopts iterator support. The two subclasses of StyleProperties
overload begin() to allow specialization when the concrete type is known.

* Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::consumeTouchAction):
(WebCore::CSSPropertyParserHelpers::consumeTextDecorationLine):
Adopt template consumeIdent and update for new reference taking hasValue().

* Source/WebCore/css/typedom/DeclaredStylePropertyMap.cpp:
(WebCore::DeclaredStylePropertyMap::entries const):
Adopt WTF::map() now that it can be used due to iterator for StyleProperties.

* Source/WebCore/editing/EditingStyle.cpp:
(WebCore::applyTextDecorationChangeToValueList):
Update for new hasValue/removeValue interfaces.

(WebCore::EditingStyle::removeStyleAddedByNode):
Use auto (which is going to infer Ref now rather than RefPtr) and update
uses to pass non-null references.

(WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode):
Adopt range-based for loop using the new iterator.

(WebCore::EditingStyle::conflictsWithInlineStyleOfElement const):
Adopt range-based for loop using the new iterator.

* Source/WebCore/editing/Editor.cpp:
(WebCore::Editor::fontAttributesAtSelectionStart):
Adopt new CSSValueID overloads of hasValue.

* Source/WebCore/page/PageSerializer.cpp:
(WebCore::PageSerializer::retrieveResourcesForProperties):
Adopt range-based for loop using the new iterator.

* Source/WebCore/style/ElementRuleCollector.cpp:
(WebCore::Style::ElementRuleCollector::addMatchedProperties):
Adopt range-based for loop using the new iterator.

* Source/WebCore/style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::addMatch):
(WebCore::Style::hasImportantProperties):
Adopt range-based for loop using the new iterator.

* Source/WebCore/style/StyleResolver.cpp:
(WebCore::Style::Resolver::styleForKeyframe):
Adopt range-based for loop using the new iterator.

Canonical link: https://commits.webkit.org/257356@main

62c3aa9

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	~~🛠 wincairo~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	❌ 🧪 mac-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
~~🛠 🧪 merge~~	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-11-30T20:12:58Z

EWS run on previous version of this PR (hash 9f61846)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🛠 mac-AS-debug	❌ 🧪 gtk-wk2
	❌ 🧪 api-ios	~~🧪 api-mac~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	✅ 🛠 tv	❌ 🧪 mac-wk1	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	❌ 🧪 mac-AS-debug-wk2	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 jsc-mips-tests

graouts · 2022-11-30T20:22:58Z

Source/WebCore/animation/KeyframeEffect.cpp

@@ -2271,8 +2271,8 @@ void KeyframeEffect::computeHasImplicitKeyframeForAcceleratedProperty()
            HashSet<CSSPropertyID> explicitZeroProperties;
            HashSet<CSSPropertyID> explicitOneProperties;
            auto styleProperties = keyframe.style;
-            for (unsigned i = 0; i < styleProperties->propertyCount(); ++i) {
-                auto property = styleProperties->propertyAt(i).id();
+            for (auto propertyReference : styleProperties.get()) {


graouts · 2022-11-30T20:23:44Z

Source/WebCore/animation/KeyframeEffect.cpp

-            for (unsigned i = 0; i < styleProperties->propertyCount(); ++i) {
-                auto property = styleProperties->propertyAt(i).id();
-                if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(property))
+            for (auto property : styleProperties.get()) {


graouts · 2022-11-30T20:24:18Z

Source/WebCore/style/StyleResolver.cpp

    bool hasRevert = false;
-    for (unsigned i = 0; i < propertyCount; ++i) {
-        auto propertyReference = keyframe.properties().propertyAt(i);
+    for (auto propertyReference : keyframe.properties()) {


webkit-early-warning-system · 2022-12-01T21:36:56Z

EWS run on previous version of this PR (hash 9a0837c)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	⏳ 🛠 wincairo
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	~~🧪 mac-wk1~~	~~🧪 api-gtk~~
✅ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk2~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-12-02T02:07:18Z

EWS run on previous version of this PR (hash 2adf7eb)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	✅ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk1	❌ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	❌ 🧪 mac-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-12-03T04:14:52Z

EWS run on previous version of this PR (hash e734b74)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	❌ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	⏳ 🛠 wincairo
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	~~🧪 mac-wk2~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 jsc-armv7-tests
	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

webkit-early-warning-system · 2022-12-03T22:26:04Z

EWS run on current version of this PR (hash 62c3aa9)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 🧪 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🛠 gtk	~~🛠 wincairo~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk1	✅ 🧪 api-gtk
✅ 🛠 🧪 jsc	✅ 🛠 tv	❌ 🧪 mac-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv-sim	❌ 🧪 mac-AS-debug-wk2	✅ 🧪 jsc-armv7-tests
~~🛠 🧪 merge~~	✅ 🛠 watch	✅ 🧪 mac-wk2-stress	✅ 🛠 jsc-mips
✅ 🛠 🧪 unsafe-merge	✅ 🛠 watch-sim		✅ 🧪 jsc-mips-tests

https://bugs.webkit.org/show_bug.cgi?id=248546 rdar://102823936 Reviewed by Antoine Quint. Add iterator support for StyleProperties, ImmutableStyleProperties and MutableStyleProperties to allow iterating through the stored properties using for-in as well generic algorithms. * Source/WTF/wtf/Vector.h: (WTF::Mapper::map): (WTF::CompactMapper::compactMap): (WTF::copyToVectorSpecialization): Use a universal reference to allow iterators that return temporaries (like the one for StyleProperties) to work with the mapping code. * Source/WebCore/animation/KeyframeEffect.cpp: (WebCore::KeyframeEffect::computeHasImplicitKeyframeForAcceleratedProperty): (WebCore::KeyframeEffect::computeHasKeyframeComposingAcceleratedProperty): Adopt range-based for loop using the new iterator. * Source/WebCore/css/CSSValueList.cpp: (WebCore::CSSValueList::removeAll): (WebCore::CSSValueList::hasValue const): * Source/WebCore/css/CSSValueList.h: Remove versions of removeAll() and hasValue() taking a nullable CSSValue*, and replace them with overloads that take either a CSSValue& or a CSSValueID. The CSSValueID allows us to check use without allocation or pool lookup. * Source/WebCore/css/ComputedStyleExtractor.cpp: (WebCore::ComputedStyleExtractor::fontVariantShorthandValue): (WebCore::ComputedStyleExtractor::getCSSPropertyValuesForShorthandProperties): (WebCore::ComputedStyleExtractor::getCSSPropertyValuesForGridShorthand): Adopt range-based for loop using existing shorthand iterator support. Use isValueID helper to simplify a condition. * Source/WebCore/css/PropertySetCSSStyleDeclaration.cpp: (WebCore::PropertySetCSSStyleDeclaration::length const): Adopt range-based for loop using the new iterator. * Source/WebCore/css/StyleProperties.cpp: (WebCore::MutableStyleProperties::MutableStyleProperties): (WebCore::StyleProperties::commonShorthandChecks const): (WebCore::StyleProperties::asTextInternal const): (WebCore::MutableStyleProperties::mergeAndOverrideOnConflict): (WebCore::StyleProperties::traverseSubresources const): * Source/WebCore/css/StyleProperties.h: (WebCore::StyleProperties::Iterator::Iterator): (WebCore::StyleProperties::Iterator::operator* const): (WebCore::StyleProperties::Iterator::operator++): (WebCore::StyleProperties::Iterator::operator== const): (WebCore::StyleProperties::Iterator::operator!= const): (WebCore::StyleProperties::begin const): (WebCore::StyleProperties::end): (WebCore::StyleProperties::size const): Adds and adopts iterator support. The two subclasses of StyleProperties overload begin() to allow specialization when the concrete type is known. * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeTouchAction): (WebCore::CSSPropertyParserHelpers::consumeTextDecorationLine): Adopt template consumeIdent and update for new reference taking hasValue(). * Source/WebCore/css/typedom/DeclaredStylePropertyMap.cpp: (WebCore::DeclaredStylePropertyMap::entries const): Adopt WTF::map() now that it can be used due to iterator for StyleProperties. * Source/WebCore/editing/EditingStyle.cpp: (WebCore::applyTextDecorationChangeToValueList): Update for new hasValue/removeValue interfaces. (WebCore::EditingStyle::removeStyleAddedByNode): Use auto (which is going to infer Ref now rather than RefPtr) and update uses to pass non-null references. (WebCore::EditingStyle::removeStyleConflictingWithStyleOfNode): Adopt range-based for loop using the new iterator. (WebCore::EditingStyle::conflictsWithInlineStyleOfElement const): Adopt range-based for loop using the new iterator. * Source/WebCore/editing/Editor.cpp: (WebCore::Editor::fontAttributesAtSelectionStart): Adopt new CSSValueID overloads of hasValue. * Source/WebCore/page/PageSerializer.cpp: (WebCore::PageSerializer::retrieveResourcesForProperties): Adopt range-based for loop using the new iterator. * Source/WebCore/style/ElementRuleCollector.cpp: (WebCore::Style::ElementRuleCollector::addMatchedProperties): Adopt range-based for loop using the new iterator. * Source/WebCore/style/PropertyCascade.cpp: (WebCore::Style::PropertyCascade::addMatch): (WebCore::Style::hasImportantProperties): Adopt range-based for loop using the new iterator. * Source/WebCore/style/StyleResolver.cpp: (WebCore::Style::Resolver::styleForKeyframe): Adopt range-based for loop using the new iterator. Canonical link: https://commits.webkit.org/257356@main

webkit-commit-queue · 2022-12-04T16:46:44Z

Committed 257356@main (bd076ef): https://commits.webkit.org/257356@main

Reviewed commits have been landed. Closing PR #6981 and removing active labels.

weinig requested review from graouts, cdumez and rniwa as code owners November 30, 2022 20:12

weinig self-assigned this Nov 30, 2022

weinig added the WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit). label Nov 30, 2022

weinig marked this pull request as draft November 30, 2022 20:12

weinig requested a review from darinadler November 30, 2022 20:12

graouts reviewed Nov 30, 2022

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 30, 2022

weinig removed the merging-blocked Applied to prevent a change from being merged label Dec 1, 2022

weinig force-pushed the eng/Add-an-iterator-for-the-StyleProperties-family-of-classes branch from 9f61846 to 9a0837c Compare December 1, 2022 21:34

weinig force-pushed the eng/Add-an-iterator-for-the-StyleProperties-family-of-classes branch from 9a0837c to 2adf7eb Compare December 2, 2022 02:07

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 2, 2022

graouts approved these changes Dec 2, 2022

View reviewed changes

weinig marked this pull request as ready for review December 2, 2022 17:26

weinig removed the merging-blocked Applied to prevent a change from being merged label Dec 3, 2022

weinig force-pushed the eng/Add-an-iterator-for-the-StyleProperties-family-of-classes branch from 2adf7eb to e734b74 Compare December 3, 2022 04:14

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Dec 3, 2022

weinig removed the merging-blocked Applied to prevent a change from being merged label Dec 3, 2022

weinig force-pushed the eng/Add-an-iterator-for-the-StyleProperties-family-of-classes branch from e734b74 to 62c3aa9 Compare December 3, 2022 22:25

weinig added the merge-queue Applied to send a pull request to merge-queue label Dec 4, 2022

webkit-ews-buildbot added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Dec 4, 2022

weinig added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Dec 4, 2022

webkit-early-warning-system force-pushed the eng/Add-an-iterator-for-the-StyleProperties-family-of-classes branch from 62c3aa9 to bd076ef Compare December 4, 2022 16:46

webkit-early-warning-system merged commit bd076ef into WebKit:main Dec 4, 2022

webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Dec 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add an iterator for the StyleProperties family of classes #6981

Add an iterator for the StyleProperties family of classes #6981

weinig commented Nov 30, 2022 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Nov 30, 2022 •

edited

graouts Nov 30, 2022

graouts Nov 30, 2022

graouts Nov 30, 2022

webkit-early-warning-system commented Dec 1, 2022 •

edited

webkit-early-warning-system commented Dec 2, 2022 •

edited

webkit-early-warning-system commented Dec 3, 2022 •

edited

webkit-early-warning-system commented Dec 3, 2022 •

edited

webkit-commit-queue commented Dec 4, 2022

Add an iterator for the StyleProperties family of classes #6981

Add an iterator for the StyleProperties family of classes #6981

Conversation

weinig commented Nov 30, 2022 • edited by webkit-early-warning-system

bd076ef

webkit-early-warning-system commented Nov 30, 2022 • edited

graouts Nov 30, 2022

Choose a reason for hiding this comment

graouts Nov 30, 2022

Choose a reason for hiding this comment

graouts Nov 30, 2022

Choose a reason for hiding this comment

webkit-early-warning-system commented Dec 1, 2022 • edited

webkit-early-warning-system commented Dec 2, 2022 • edited

webkit-early-warning-system commented Dec 3, 2022 • edited

webkit-early-warning-system commented Dec 3, 2022 • edited

webkit-commit-queue commented Dec 4, 2022

weinig commented Nov 30, 2022 •

edited by webkit-early-warning-system

`bd076ef`

webkit-early-warning-system commented Nov 30, 2022 •

edited

webkit-early-warning-system commented Dec 1, 2022 •

edited

webkit-early-warning-system commented Dec 2, 2022 •

edited

webkit-early-warning-system commented Dec 3, 2022 •

edited

webkit-early-warning-system commented Dec 3, 2022 •

edited