[css-masking] Implement mask-border properties
#17217
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash 7e47148)
|
webkit-ews-buildbot
added
the
merging-blocked
nt1m
changed the title
mask-border properties
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
7e47148
to
c7e4532
Compare
|
EWS run on previous version of this PR (hash c7e4532)
|
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
c7e4532
to
68f5300
Compare
nt1m
changed the title
mask-border properties
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
68f5300
to
3aaea52
Compare
|
EWS run on previous version of this PR (hash 3aaea52)
|
|
EWS run on previous version of this PR (hash 68f5300)
|
webkit-ews-buildbot
added
the
merging-blocked
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
3aaea52
to
06c386f
Compare
|
EWS run on previous version of this PR (hash 06c386f)
|
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
06c386f
to
1ebe3d8
Compare
|
EWS run on previous version of this PR (hash 1ebe3d8) |
webkit-ews-buildbot
added
the
merging-blocked
darinadler
approved these changes
Aug 30, 2023
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
1ebe3d8
to
c53288b
Compare
|
EWS run on previous version of this PR (hash c53288b)
|
nt1m
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
c53288b
to
79f7ffe
Compare
|
EWS run on current version of this PR (hash 79f7ffe) |
nt1m
added
merge-queue
https://bugs.webkit.org/show_bug.cgi?id=229900 rdar://82991599 Reviewed by Darin Adler. This patch aliases -webkit-mask-box-image-* to mask-border-*, with a few changes: - the initial value of mask-border-slice is now `0` instead of `0 fill` - the `-webkit-mask-box-image` prop is implemented as a separate shorthand that sets the `fill` on the slice property unlike the `mask-border` shorthand This is similar to how -webkit-border-image and border-image are setup. Setting the mask shorthand (but not -webkit-mask) now also resets the `mask-border-*` properties as specified. Also mass rename maskBoxImage in the codebase to maskBorder. Specification at: https://drafts.fxtf.org/css-masking/#the-mask-border * LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt: * LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: * LayoutTests/fast/css/getComputedStyle/getComputedStyle-webkit-mask-box-image.html: * LayoutTests/fast/css/mask-box-image-parsing-expected.txt: * LayoutTests/fast/css/mask-box-image-parsing.html: * LayoutTests/fast/css/uri-token-parsing-expected.txt: * LayoutTests/fast/css/uri-token-parsing.html: * LayoutTests/fast/masking/parsing-mask-repeat-expected.txt: * LayoutTests/fast/masking/parsing-mask-repeat.html: * LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-masking/inheritance.sub-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-masking/mask-shorthand-subproperties-reset-expected.txt: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-masking/mask-shorthand-subproperties-reset.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-masking/parsing/mask-valid.sub-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-masking/parsing/mask-valid.sub.html: * LayoutTests/platform/glib/imported/w3c/web-platform-tests/css/css-masking/parsing/mask-valid.sub-expected.txt: * LayoutTests/platform/gtk/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/platform/ipad/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/platform/wpe/imported/w3c/web-platform-tests/css/css-cascade/all-prop-initial-xml-expected.txt: * LayoutTests/svg/css/getComputedStyle-basic-expected.txt: * Source/WebCore/animation/CSSPropertyAnimation.cpp: (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap): * Source/WebCore/css/CSSProperties.json: * Source/WebCore/css/ComputedStyleExtractor.cpp: (WebCore::ComputedStyleExtractor::valueForPropertyInStyle const): * Source/WebCore/css/ShorthandSerializer.cpp: (WebCore::ShorthandSerializer::serialize): (WebCore::ShorthandSerializer::serializeBorderImage const): * Source/WebCore/css/parser/CSSPropertyParser.cpp: (WebCore::initialValueForLonghand): (WebCore::isInitialValueForLonghand): (WebCore::initialValueTextForLonghand): (WebCore::initialValueIDForLonghand): (WebCore::CSSPropertyParser::consumeBorderImage): (WebCore::CSSPropertyParser::consumeBackgroundShorthand): (WebCore::CSSPropertyParser::parseShorthand): * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeBorderImageComponents): * Source/WebCore/rendering/InlineBoxPainter.cpp: (WebCore::InlineBoxPainter::paintMask): * Source/WebCore/rendering/RenderBox.cpp: (WebCore::RenderBox::paintMaskImages): (WebCore::RenderBox::maskClipRect): (WebCore::RenderBox::imageChanged): * Source/WebCore/rendering/RenderElement.cpp: (WebCore::RenderElement::styleDidChange): (WebCore::RenderElement::willBeDestroyed): * Source/WebCore/rendering/RenderLayer.cpp: (WebCore::RenderLayer::calculateClipRects const): * Source/WebCore/rendering/style/NinePieceImage.cpp: (WebCore::NinePieceImage::defaultMaskData): * Source/WebCore/rendering/style/RenderStyle.cpp: (WebCore::rareDataChangeRequiresLayerRepaint): * Source/WebCore/rendering/style/RenderStyle.h: (WebCore::RenderStyle::initialMaskBorderSource): (WebCore::RenderStyle::initialMaskBoxImageSource): Deleted. * Source/WebCore/rendering/style/RenderStyleInlines.h: (WebCore::RenderStyle::hasMask const): (WebCore::RenderStyle::maskBorder const): (WebCore::RenderStyle::maskBorderOutsets const): (WebCore::RenderStyle::maskBorderSource const): (WebCore::RenderStyle::maskBoxImage const): Deleted. (WebCore::RenderStyle::maskBoxImageOutsets const): Deleted. (WebCore::RenderStyle::maskBoxImageSource const): Deleted. * Source/WebCore/rendering/style/RenderStyleSetters.h: (WebCore::RenderStyle::setMaskBorder): (WebCore::RenderStyle::setMaskBorderSource): (WebCore::RenderStyle::setMaskBoxImage): Deleted. (WebCore::RenderStyle::setMaskBoxImageSource): Deleted. * Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): (WebCore::StyleRareNonInheritedData::operator== const): * Source/WebCore/rendering/style/StyleRareNonInheritedData.h: * Source/WebCore/rendering/style/StyleReflection.h: (WebCore::StyleReflection::StyleReflection): * Source/WebCore/rendering/style/WillChangeData.cpp: (WebCore::WillChangeData::propertyCreatesStackingContext): * Source/WebCore/style/StyleBuilderConverter.h: (WebCore::Style::BuilderConverter::convertReflection): * Source/WebCore/style/StyleBuilderCustom.h: (WebCore::Style::ApplyPropertyBorderImageModifier::applyInitialValue): (WebCore::Style::ApplyPropertyBorderImageModifier::getValue): (WebCore::Style::ApplyPropertyBorderImageModifier::setValue): * Source/WebCore/style/StylePendingResources.cpp: (WebCore::Style::loadPendingResources): Canonical link: https://commits.webkit.org/267460@main
webkit-commit-queue
force-pushed
the
eng/css-masking-Implement-mask-border-properties
branch
from
79f7ffe
to
ecf24fd
Compare
|
Committed 267460@main (ecf24fd): https://commits.webkit.org/267460@main Reviewed commits have been landed. Closing PR #17217 and removing active labels. |
webkit-commit-queue
removed
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ecf24fd
79f7ffe
🧪 wpe-wk2🧪 gtk-wk2🧪 mac-AS-debug-wk2🛠 🧪 merge