Refactor container-type into a Style value type

[kate-k-lee]

d9dde2e

Refactor container-type into a Style value type
https://bugs.webkit.org/show_bug.cgi?id=315483

Reviewed by Sam Weinig and Tim Nguyen.

Migrate the computed value of the container-type property from the
ContainerType enum (a 2-bit bitfield in NonInheritedRareData) to a
Style::ContainerType value type with computed-style-storage-kind
"reference", matching the sibling properties stored in the same struct
(scrollbar-gutter -> Style::ScrollbarGutter, scroll-snap-type ->
Style::ScrollSnapType).

This is a preparatory, non-functional change: only normal, size and
inline-size are supported, exactly as before. Call sites that compared
against ContainerType::Normal now use the equivalent isNormal() /
hasSize() / hasInlineSize() accessors on Style::ContainerType.

No new tests, as there is no behavior change.

* Source/WebCore/Headers.cmake:
* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/css/CSSProperties.json:
* Source/WebCore/dom/Document.cpp:
(WebCore::Document::updateLayoutIfDimensionsOutOfDate):
* Source/WebCore/dom/Element.cpp:
(WebCore::Element::resolveComputedStyle):
* Source/WebCore/rendering/RenderBlock.cpp:
(WebCore::RenderBlock::establishesIndependentFormattingContextIgnoringDisplayType const):
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::willBeDestroyed):
(WebCore::RenderBox::styleWillChange):
* Source/WebCore/rendering/RenderElement.cpp:
(WebCore::RenderElement::hasEligibleContainmentForSizeQuery const):
* Source/WebCore/rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::usedContain const):
* Source/WebCore/rendering/style/RenderStyleConstants.h:
* Source/WebCore/style/ContainerQueryEvaluator.cpp:
(WebCore::Style::ContainerQueryEvaluator::selectContainer):
* Source/WebCore/style/StyleBuilderCustom.h:
(WebCore::Style::forwardInheritedValue):
* Source/WebCore/style/StyleExtractor.cpp:
(WebCore::Style::hasValidStyleForProperty):
* Source/WebCore/style/StyleExtractorCustom.h:
(WebCore::Style::ExtractorCustom::extractContainerShorthand):
(WebCore::Style::ExtractorCustom::extractContainerShorthandSerialization):
* Source/WebCore/style/StyleScope.cpp:
(WebCore::Style::Scope::invalidateForContainerDependencies):
* Source/WebCore/style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::pushParent):
(WebCore::Style::TreeResolver::updateStateForQueryContainer):
* Source/WebCore/style/computed/StyleComputedStyleBase.h:
* Source/WebCore/style/computed/data/StyleNonInheritedRareData.cpp:
(WebCore::Style::NonInheritedRareData::NonInheritedRareData):
(WebCore::Style::NonInheritedRareData::operator== const):
(WebCore::Style::NonInheritedRareData::usedContain const):
(WebCore::Style::NonInheritedRareData::dumpDifferences const):
* Source/WebCore/style/computed/data/StyleNonInheritedRareData.h:
* Source/WebCore/style/values/contain/StyleContainerType.cpp: Added.
(WebCore::Style::CSSValueConversion<ContainerType>::operator):
* Source/WebCore/style/values/contain/StyleContainerType.h: Added.
(WebCore::Style::ContainerType::ContainerType):
(WebCore::Style::ContainerType::isNormal const):
(WebCore::Style::ContainerType::hasSize const):
(WebCore::Style::ContainerType::hasInlineSize const):
(WebCore::Style::ContainerType::hasSizeContainment const):
(WebCore::Style::ContainerType::switchOn const):
* Source/WebCore/style/values/primitives/StyleKeyword+Mappings.h:

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

6b5b32d

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	🛠 tv-sim	❌ 🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

[webkit-early-warning-system]

EWS run on previous version of this PR (hash 89b70e0)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	🛠 mac	✅ 🛠 wpe	🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2	🧪 win-tests
✅ 🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	✅ 🧪 api-wpe
	🧪 ios-wk2-wpt	🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	🧪 api-ios	🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	🧪 mac-wk2	🧪 gtk-wk2
	✅ 🛠 vision	🧪 mac-AS-debug-wk2	🧪 api-gtk
	🛠 vision-sim	🧪 mac-wk2-stress	🛠 playstation
	🧪 vision-wk2	🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim	🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

[webkit-early-warning-system]

EWS run on current version of this PR (hash 6b5b32d)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
	✅ 🛠 ios-safer-cpp	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	🛠 tv-sim	❌ 🧪 mac-site-isolation
	✅ 🛠 watch
	✅ 🛠 watch-sim

[weinig]

Look great.

[kate-k-lee]

@weinig
Thanks for approving! Since I'm not a committer yet, I can't queue it myself. would you mind adding it to the merge-queue for me? Appreciate it!

[webkit-commit-queue]

Committed 313869@main (d9dde2e): https://commits.webkit.org/313869@main

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