Changeset 293090 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Apr 20, 2022, 4:51:47 AM (3 years ago)

Author:

cathiechen

Message:

Parsing of contain-intrinsic-size and adding a runtime flag for it
​https://bugs.webkit.org/show_bug.cgi?id=238181

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• web-platform-tests/css/css-sizing/contain-intrinsic-size/animation/contain-intrinsic-size-interpolation-expected.txt:
• web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed-expected.txt:
• web-platform-tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-valid-expected.txt:
• web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:

Source/WebCore:

Parsing of contain-intrinsic-size according to [1]. In order to parse the shorthand properly,
the latest draft has been updated to "none | <length> | auto <length>". ContainIntrinsicSizeType
in RenderStyle, indicates the type of value. containIntrinsicWidth/Height indicates the length
value for Length and AutoAndLength type.
Thanks to Rob Buis for helping with this patch.

[1] ​https://www.w3.org/TR/css-sizing-4/#intrinsic-size-override

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::valueForContainIntrinsicSize):
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• css/CSSProperties.json:
• css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue const):
(WebCore::StyleProperties::asTextInternal const):

• css/parser/CSSParserContext.cpp:

(WebCore::operator==):
(WebCore::add):
(WebCore::CSSParserContext::isPropertyRuntimeDisabled const):

• css/parser/CSSParserContext.h:
• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeContainIntrinsicSize):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::consumeContainIntrinsicSizeShorthand):
(WebCore::CSSPropertyParser::parseShorthand):

• css/parser/CSSPropertyParser.h:
• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::containIntrinsicWidthType const):
(WebCore::RenderStyle::containIntrinsicHeightType const):
(WebCore::RenderStyle::containIntrinsicWidth const):
(WebCore::RenderStyle::containIntrinsicHeight const):
(WebCore::RenderStyle::setContainIntrinsicWidthType):
(WebCore::RenderStyle::setContainIntrinsicHeightType):
(WebCore::RenderStyle::setContainIntrinsicWidth):
(WebCore::RenderStyle::setContainIntrinsicHeight):
(WebCore::RenderStyle::initialContainIntrinsicWidthType):
(WebCore::RenderStyle::initialContainIntrinsicHeightType):
(WebCore::RenderStyle::initialContainIntrinsicWidth):
(WebCore::RenderStyle::initialContainIntrinsicHeight):

• rendering/style/RenderStyleConstants.cpp:

(WebCore::operator<<):

• rendering/style/RenderStyleConstants.h:
• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator== const):

• rendering/style/StyleRareNonInheritedData.h:
• style/StyleBuilderCustom.h:

(WebCore::Style::BuilderCustom::applyInitialContainIntrinsicWidth):
(WebCore::Style::BuilderCustom::applyInheritContainIntrinsicWidth):
(WebCore::Style::BuilderCustom::applyValueContainIntrinsicWidth):
(WebCore::Style::BuilderCustom::applyInitialContainIntrinsicHeight):
(WebCore::Style::BuilderCustom::applyInheritContainIntrinsicHeight):
(WebCore::Style::BuilderCustom::applyValueContainIntrinsicHeight):
(WebCore::Style::BuilderCustom::applyInitialContainIntrinsicBlockSize):
(WebCore::Style::BuilderCustom::applyInheritContainIntrinsicBlockSize):
(WebCore::Style::BuilderCustom::applyValueContainIntrinsicBlockSize):
(WebCore::Style::BuilderCustom::applyInitialContainIntrinsicInlineSize):
(WebCore::Style::BuilderCustom::applyInheritContainIntrinsicInlineSize):
(WebCore::Style::BuilderCustom::applyValueContainIntrinsicInlineSize):

Source/WTF:

• Scripts/Preferences/WebPreferencesExperimental.yaml:

LayoutTests:

• platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• platform/ios/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1667 +1667 @@
 
     ASSERT_NOT_REACHED();
+    return cssValuePool.createIdentifierValue(CSSValueNone);
+}
+
+static Ref<CSSValue> valueForContainIntrinsicSize(const RenderStyle& style, const ContainIntrinsicSizeType& type, const std::optional<Length> containIntrinsicLength)
+{
+    auto& cssValuePool = CSSValuePool::singleton();
+
+    switch (type) {
+    case ContainIntrinsicSizeType::None:
+        return cssValuePool.createIdentifierValue(CSSValueNone);
+    case ContainIntrinsicSizeType::Length: {
+        ASSERT(containIntrinsicLength.has_value());
+        return zoomAdjustedPixelValueForLength(containIntrinsicLength.value(), style);
+    }
+    case ContainIntrinsicSizeType::AutoAndLength: {
+        auto autoValue = cssValuePool.createIdentifierValue(CSSValueAuto);
+        auto list = CSSValueList::createSpaceSeparated();
+        list->append(autoValue);
+        ASSERT(containIntrinsicLength.has_value());
+        list->append(zoomAdjustedPixelValueForLength(containIntrinsicLength.value(), style));
+        return list;
+    }
+    }
+    RELEASE_ASSERT_NOT_REACHED();
     return cssValuePool.createIdentifierValue(CSSValueNone);
 }
@@ -3763 +3787 @@
             return list;
         }
+        case CSSPropertyContainIntrinsicSize: {
+            if (!m_element->document().settings().cssContainIntrinsicSizeEnabled())
+                return nullptr;
+            return getCSSPropertyValuesFor2SidesShorthand(containIntrinsicSizeShorthand());
+        }
+        case CSSPropertyContainIntrinsicWidth: {
+            if (!m_element->document().settings().cssContainIntrinsicSizeEnabled())
+                return nullptr;
+            return valueForContainIntrinsicSize(style, style.containIntrinsicWidthType(), style.containIntrinsicWidth());
+        }
+        case CSSPropertyContainIntrinsicHeight: {
+            if (!m_element->document().settings().cssContainIntrinsicSizeEnabled())
+                return nullptr;
+            return valueForContainIntrinsicSize(style, style.containIntrinsicHeightType(), style.containIntrinsicHeight());
+        }
         case CSSPropertyBackfaceVisibility:
             return cssValuePool.createIdentifierValue((style.backfaceVisibility() == BackfaceVisibility::Hidden) ? CSSValueHidden : CSSValueVisible);
@@ -4222 +4261 @@
         case CSSPropertyScrollPaddingInlineEnd:
         case CSSPropertyScrollPaddingInlineStart:
+        case CSSPropertyContainIntrinsicBlockSize:
+        case CSSPropertyContainIntrinsicInlineSize:
             ASSERT_NOT_REACHED();
             break;