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

Timestamp:

May 29, 2022, 12:57:37 AM (3 years ago)

Author:

[email protected]

Message:

Replace CSS3_TEXT build flag with Experimental feature settings
​https://bugs.webkit.org/show_bug.cgi?id=121875

Patch by Kiet Ho <Kiet Ho> on 2022-05-29
Reviewed by Tim Nguyen and Myles C. Maxfield.

Currently, -webkit-text-align-last and -webkit-text-justify are gated behind
the ENABLE(CSS3_TEXT) build flag. EWS bots doesn't enable it, hence the properties
aren't tested even though tests are available for them. This patch replaces the build
flag with two experimental settings, which is on during layout tests, allowing the
properties to be tested.

• LayoutTests/TestExpectations:
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• LayoutTests/platform/win/TestExpectations:
• LayoutTests/platform/wincairo/TestExpectations:
• LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt:
• LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/cssom/getComputedStyle-detached-subtree-expected.txt:
• Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml:
• Source/WTF/wtf/PlatformEnable.h:
• Source/WebCore/animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
Temporarily mark -webkit-text-align-last and -webkit-text-justify as not animatable
to avoid the assert. CSS animations for those properties will be implemented in
webkit.org/b/240591.

• Source/WebCore/css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• Source/WebCore/css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::operator TextJustify const):

• Source/WebCore/css/CSSProperties.json:
• Source/WebCore/css/StyleProperties.cpp:
• Source/WebCore/css/parser/CSSParserContext.cpp:

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

• Source/WebCore/css/parser/CSSParserContext.h:
• Source/WebCore/css/parser/CSSParserFastPaths.cpp:

(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):

• Source/WebCore/rendering/LegacyLineLayout.cpp:

(WebCore::LegacyLineLayout::textAlignmentForLine const):

• Source/WebCore/rendering/style/RenderStyle.cpp:

(WebCore::rareInheritedDataChangeRequiresLayout):

• Source/WebCore/rendering/style/RenderStyle.h:

(WebCore::RenderStyle::textIndentType const):
(WebCore::RenderStyle::textJustify const):
(WebCore::RenderStyle::setTextIndentType):
(WebCore::RenderStyle::setTextJustify):
(WebCore::RenderStyle::initialTextIndentType):
(WebCore::RenderStyle::initialTextJustify):

• Source/WebCore/rendering/style/RenderStyleConstants.h:
• Source/WebCore/rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator== const):

• Source/WebCore/rendering/style/StyleRareInheritedData.h:
• Source/WebKitLegacy/win/WebPreferences.cpp:

(WebPreferences::cssTextAlignLastEnabled):
(WebPreferences::cssTextJustifyEnabled):

• Source/WebKitLegacy/win/WebPreferences.h:
• Source/WebKitLegacy/win/WebView.cpp:

(WebView::notifyPreferencesChanged):

• Source/cmake/OptionsWin.cmake:
• Source/cmake/WebKitFeatures.cmake:
• Source/cmake/tools/vsprops/FeatureDefines.props:
• Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
• Tools/DumpRenderTree/TestOptions.cpp:

(WTR::TestOptions::defaults):

• Tools/Scripts/webkitperl/FeatureList.pm:

Canonical link: ​https://commits.webkit.org/251105@main

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -3558 +3558 @@
         case CSSPropertyTextDecoration:
             return renderTextDecorationLineFlagsToCSSValue(style.textDecorationLine());
-#if ENABLE(CSS3_TEXT)
         case CSSPropertyWebkitTextAlignLast:
+            if (!m_element->document().settings().cssTextAlignLastEnabled())
+                return nullptr;
             return cssValuePool.createValue(style.textAlignLast());
         case CSSPropertyWebkitTextJustify:
+            if (!m_element->document().settings().cssTextJustifyEnabled())
+                return nullptr;
             return cssValuePool.createValue(style.textJustify());
-#endif // CSS3_TEXT
         case CSSPropertyWebkitTextDecoration:
             return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand());