nephele
/
haikuwebkit
1
0
Fork 0
Code Issues Releases Activity
haikuwebkit/LayoutTests/css3/parse-justify-content-expec...

14 lines
518 B
Plaintext
Raw Permalink Normal View History

[CSS Box Alignment] Upgrade justify-content parsing to CSS3 Box Alignment spec. https://bugs.webkit.org/show_bug.cgi?id=144442 Reviewed by David Hyatt. Upgrade the justify-content property to the last CSS3 Box Alignment specification. It defines a different enumeration for Positional and Distribution alignment, which requires changes in the FlexibleBox implementation. Source/WebCore: A new parsing function has been implemented to replace the basic keyword IDs validation. Because of the complexity of the new values, a new CSSPrimitiveValue derived class has been defined which simplifies considerably the parsing logic. We will follow the same approach than for Self Alignment, defining a single class to hold all the related alignment data. This makes possible to use a StyleBuilderConverter function instead of custom builder functions for these properties. Test: css3/parse-justify-content.html * CMakeLists.txt: * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::resolveContentAlignmentAuto): (WebCore::valueForContentPositionAndDistributionWithOverflowAlignment): (WebCore::ComputedStyleExtractor::propertyValue): (WebCore::valueForItemPositionWithOverflowAlignment): Deleted. * css/CSSContentDistributionValue.cpp: Added. (WebCore::CSSContentDistributionValue::CSSContentDistributionValue): (WebCore::CSSContentDistributionValue::~CSSContentDistributionValue): (WebCore::CSSContentDistributionValue::customCSSText): (WebCore::CSSContentDistributionValue::equals): * css/CSSContentDistributionValue.h: Added. (WebCore::CSSContentDistributionValue::create): (WebCore::CSSContentDistributionValue::distribution): (WebCore::CSSContentDistributionValue::position): (WebCore::CSSContentDistributionValue::overflow): * css/CSSParser.cpp: (WebCore::isValidKeywordPropertyAndValue): (WebCore::isKeywordPropertyID): (WebCore::CSSParser::parseValue): (WebCore::isContentDistributionKeyword): (WebCore::isContentPositionKeyword): (WebCore::isAlignmentOverflowKeyword): (WebCore::CSSParser::parseContentDistributionOverflowPosition): (WebCore::CSSParser::parseItemPositionOverflowPosition): (WebCore::CSSParser::parseLegacyPosition): Deleted. * css/CSSParser.h: * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): (WebCore::CSSPrimitiveValue::operator ContentPosition): (WebCore::CSSPrimitiveValue::operator ContentDistributionType): (WebCore::CSSPrimitiveValue::operator EFlexDirection): Deleted. * css/CSSPropertyNames.in: * css/CSSValue.cpp: (WebCore::CSSValue::equals): (WebCore::CSSValue::cssText): (WebCore::CSSValue::destroy): * css/CSSValue.h: (WebCore::CSSValue::isContentDistributionValue): (WebCore::CSSValue::isWebKitCSSFilterValue): Deleted. * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::convertContentAlignmentData): (WebCore::StyleBuilderConverter::convertSelfOrDefaultAlignmentData): Deleted. * rendering/RenderFlexibleBox.cpp: (WebCore::initialJustifyContentOffset): (WebCore::justifyContentSpaceBetweenChildren): (WebCore::RenderFlexibleBox::layoutAndPlaceChildren): (WebCore::RenderFlexibleBox::layoutColumnReverse): * rendering/RenderFullScreen.cpp: (WebCore::createFullScreenStyle): * rendering/mathml/RenderMathMLScripts.cpp: (WebCore::RenderMathMLScripts::fixAnonymousStyleForSubSupPair): (WebCore::RenderMathMLScripts::fixAnonymousStyles): * rendering/style/RenderStyle.h: * rendering/style/RenderStyleConstants.h: * rendering/style/StyleContentAlignmentData.h: Added. (WebCore::StyleContentAlignmentData::StyleContentAlignmentData): (WebCore::StyleContentAlignmentData::setPosition): (WebCore::StyleContentAlignmentData::setDistribution): (WebCore::StyleContentAlignmentData::setOverflow): (WebCore::StyleContentAlignmentData::position): (WebCore::StyleContentAlignmentData::distribution): (WebCore::StyleContentAlignmentData::overflow): (WebCore::StyleContentAlignmentData::operator==): (WebCore::StyleContentAlignmentData::operator!=): * rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): (WebCore::StyleRareNonInheritedData::operator==): * rendering/style/StyleRareNonInheritedData.h: LayoutTests: Some minor changes in some Flexbox related test cases for adapting them to the new parsing logic. New layout tests, not Flexbox specific, to verify the parsing of the new values. * css3/flexbox/css-properties.html: * css3/parse-justify-content-expected.txt: Added. * css3/parse-justify-content.html: Added. Canonical link: https://commits.webkit.org/162583@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2015-05-04 17:25:21 +00:00
Test that setting and getting justify-content works as expected
Remove trailing spaces from expected.txt files (excluding WPT for now since that contains too many) https://bugs.webkit.org/show_bug.cgi?id=217016 Reviewed by Zalan Bujtas. Done with this command: find LayoutTests -name '*-expected.txt' | grep -v imported | xargs awk '/^CONSOLE MESSAGE:/ { next }; /^<\?xml/ { nextfile }; { print FILENAME; nextfile }' | xargs perl -i -pe 's/ +$//g' This affects many files, and it's not helpful to clog the change log with a list of them. Canonical link: https://commits.webkit.org/229803@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267644 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-09-27 02:15:19 +00:00
PASS Test getting justify-content values previously set through CSS.
PASS Test setting invalid values to justify-content through CSS.
PASS Test initial value of justify-content through JS
PASS Test getting and setting justify-content through JS
PASS Test bad combinations of justify-content
PASS Test the value 'initial'
PASS Test the value 'initial' for grid containers
PASS Test the value 'initial' for flex containers
PASS Test the value 'inherit'
[CSS Box Alignment] Upgrade justify-content parsing to CSS3 Box Alignment spec. https://bugs.webkit.org/show_bug.cgi?id=144442 Reviewed by David Hyatt. Upgrade the justify-content property to the last CSS3 Box Alignment specification. It defines a different enumeration for Positional and Distribution alignment, which requires changes in the FlexibleBox implementation. Source/WebCore: A new parsing function has been implemented to replace the basic keyword IDs validation. Because of the complexity of the new values, a new CSSPrimitiveValue derived class has been defined which simplifies considerably the parsing logic. We will follow the same approach than for Self Alignment, defining a single class to hold all the related alignment data. This makes possible to use a StyleBuilderConverter function instead of custom builder functions for these properties. Test: css3/parse-justify-content.html * CMakeLists.txt: * WebCore.xcodeproj/project.pbxproj: * css/CSSComputedStyleDeclaration.cpp: (WebCore::resolveContentAlignmentAuto): (WebCore::valueForContentPositionAndDistributionWithOverflowAlignment): (WebCore::ComputedStyleExtractor::propertyValue): (WebCore::valueForItemPositionWithOverflowAlignment): Deleted. * css/CSSContentDistributionValue.cpp: Added. (WebCore::CSSContentDistributionValue::CSSContentDistributionValue): (WebCore::CSSContentDistributionValue::~CSSContentDistributionValue): (WebCore::CSSContentDistributionValue::customCSSText): (WebCore::CSSContentDistributionValue::equals): * css/CSSContentDistributionValue.h: Added. (WebCore::CSSContentDistributionValue::create): (WebCore::CSSContentDistributionValue::distribution): (WebCore::CSSContentDistributionValue::position): (WebCore::CSSContentDistributionValue::overflow): * css/CSSParser.cpp: (WebCore::isValidKeywordPropertyAndValue): (WebCore::isKeywordPropertyID): (WebCore::CSSParser::parseValue): (WebCore::isContentDistributionKeyword): (WebCore::isContentPositionKeyword): (WebCore::isAlignmentOverflowKeyword): (WebCore::CSSParser::parseContentDistributionOverflowPosition): (WebCore::CSSParser::parseItemPositionOverflowPosition): (WebCore::CSSParser::parseLegacyPosition): Deleted. * css/CSSParser.h: * css/CSSPrimitiveValueMappings.h: (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): (WebCore::CSSPrimitiveValue::operator ContentPosition): (WebCore::CSSPrimitiveValue::operator ContentDistributionType): (WebCore::CSSPrimitiveValue::operator EFlexDirection): Deleted. * css/CSSPropertyNames.in: * css/CSSValue.cpp: (WebCore::CSSValue::equals): (WebCore::CSSValue::cssText): (WebCore::CSSValue::destroy): * css/CSSValue.h: (WebCore::CSSValue::isContentDistributionValue): (WebCore::CSSValue::isWebKitCSSFilterValue): Deleted. * css/CSSValueKeywords.in: * css/StyleBuilderConverter.h: (WebCore::StyleBuilderConverter::convertContentAlignmentData): (WebCore::StyleBuilderConverter::convertSelfOrDefaultAlignmentData): Deleted. * rendering/RenderFlexibleBox.cpp: (WebCore::initialJustifyContentOffset): (WebCore::justifyContentSpaceBetweenChildren): (WebCore::RenderFlexibleBox::layoutAndPlaceChildren): (WebCore::RenderFlexibleBox::layoutColumnReverse): * rendering/RenderFullScreen.cpp: (WebCore::createFullScreenStyle): * rendering/mathml/RenderMathMLScripts.cpp: (WebCore::RenderMathMLScripts::fixAnonymousStyleForSubSupPair): (WebCore::RenderMathMLScripts::fixAnonymousStyles): * rendering/style/RenderStyle.h: * rendering/style/RenderStyleConstants.h: * rendering/style/StyleContentAlignmentData.h: Added. (WebCore::StyleContentAlignmentData::StyleContentAlignmentData): (WebCore::StyleContentAlignmentData::setPosition): (WebCore::StyleContentAlignmentData::setDistribution): (WebCore::StyleContentAlignmentData::setOverflow): (WebCore::StyleContentAlignmentData::position): (WebCore::StyleContentAlignmentData::distribution): (WebCore::StyleContentAlignmentData::overflow): (WebCore::StyleContentAlignmentData::operator==): (WebCore::StyleContentAlignmentData::operator!=): * rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): (WebCore::StyleRareNonInheritedData::operator==): * rendering/style/StyleRareNonInheritedData.h: LayoutTests: Some minor changes in some Flexbox related test cases for adapting them to the new parsing logic. New layout tests, not Flexbox specific, to verify the parsing of the new values. * css3/flexbox/css-properties.html: * css3/parse-justify-content-expected.txt: Added. * css3/parse-justify-content.html: Added. Canonical link: https://commits.webkit.org/162583@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183748 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2015-05-04 17:25:21 +00:00