Avoid code duplication between ComputedStylePropertyMapReadOnly and MainThreadStylePropertyMapReadOnly #7006
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 current version of this PR (hash 083f7c7) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
requested review from
graouts,
achristensen07,
anttijk,
geoffreygaren and
grorg
anttijk
approved these changes
Dec 2, 2022
cdumez
added
merge-queue
…ainThreadStylePropertyMapReadOnly https://bugs.webkit.org/show_bug.cgi?id=248583 Reviewed by Antti Koivisto. Avoid code duplication between ComputedStylePropertyMapReadOnly and MainThreadStylePropertyMapReadOnly by having ComputedStylePropertyMapReadOnly subclass MainThreadStylePropertyMapReadOnly instead of the more generic StylePropertyMapReadOnly. Doing so exposed a bug in the way we serialize shorthand property values in MainThreadStylePropertyMapReadOnly and caused some test failures. To address the issue, we now avoid doing the serialization ourselves and rely on StyleProperties::getPropertyValue() instead. Fixing this actually caused quite a few tests to pass. * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/background-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/border-radius-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/flex-flow-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-synthesis-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-area-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-template-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/marker-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/mask-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/offset-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/text-decoration-skip-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/transition-expected.txt: * Source/WebCore/css/typedom/CSSStyleValueFactory.cpp: (WebCore::CSSStyleValueFactory::constructStyleValueForShorthandSerialization): (WebCore::CSSStyleValueFactory::extractShorthandCSSValues): (WebCore::CSSStyleValueFactory::constructStyleValueForShorthandProperty): Deleted. * Source/WebCore/css/typedom/CSSStyleValueFactory.h: * Source/WebCore/css/typedom/ComputedStylePropertyMapReadOnly.cpp: (WebCore::ComputedStylePropertyMapReadOnly::propertyValue const): (WebCore::ComputedStylePropertyMapReadOnly::shorthandPropertySerialization const): (WebCore::ComputedStylePropertyMapReadOnly::customPropertyValue const): (WebCore::ComputedStylePropertyMapReadOnly::get const): Deleted. (WebCore::ComputedStylePropertyMapReadOnly::getAll const): Deleted. (WebCore::ComputedStylePropertyMapReadOnly::has const): Deleted. * Source/WebCore/css/typedom/ComputedStylePropertyMapReadOnly.h: * Source/WebCore/css/typedom/DeclaredStylePropertyMap.cpp: (WebCore::DeclaredStylePropertyMap::shorthandPropertySerialization const): * Source/WebCore/css/typedom/DeclaredStylePropertyMap.h: * Source/WebCore/css/typedom/MainThreadStylePropertyMapReadOnly.cpp: (WebCore::MainThreadStylePropertyMapReadOnly::get const): (WebCore::MainThreadStylePropertyMapReadOnly::getAll const): (WebCore::MainThreadStylePropertyMapReadOnly::shorthandPropertyValue const): Deleted. * Source/WebCore/css/typedom/MainThreadStylePropertyMapReadOnly.h: * Source/WebCore/dom/StyledElement.cpp: * Source/WebCore/html/CustomPaintImage.cpp: Canonical link: https://commits.webkit.org/257284@main
webkit-early-warning-system
force-pushed
the
ComputedStylePropertyMapReadOnly_simplify
branch
from
083f7c7
to
95de65d
Compare
|
Committed 257284@main (95de65d): https://commits.webkit.org/257284@main Reviewed commits have been landed. Closing PR #7006 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-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.
95de65d
083f7c7
🛠 🧪 merge