wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 01:08:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2499 - Part 2: Fix overflow shorthand serialization for mixed clip values

Browse source
This commit is contained in:
MeladJM 2025-07-06 05:56:06 +08:00 • committed by roytam1
commit 205ea844f4
2 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
layout/style/Declaration.cpp
View file

@ -1086,6 +1086,16 @@ Declaration::GetPropertyValueInternal(
if (*xValue == *yValue) {
xValue->AppendToString(eCSSProperty_overflow_x, aValue, aSerialization);
} else {
// Check if either value is clip - if so, shorthand cannot be serialized
if (xValue->GetUnit() == eCSSUnit_Enumerated && yValue->GetUnit() == eCSSUnit_Enumerated) {
int32_t xVal = xValue->GetIntValue();
int32_t yVal = yValue->GetIntValue();
if (xVal == NS_STYLE_OVERFLOW_CLIP || yVal == NS_STYLE_OVERFLOW_CLIP) {
// When clip is mixed with other values, shorthand cannot be serialized
aValue.Truncate();
break;
}
}
xValue->AppendToString(eCSSProperty_overflow_x, aValue, aSerialization);
aValue.Append(char16_t(' '));
yValue->AppendToString(eCSSProperty_overflow_y, aValue, aSerialization);

27
layout/style/nsRuleNode.cpp
View file

@ -6407,35 +6407,16 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
NS_STYLE_OVERFLOW_VISIBLE);
// CSS3 overflow-x and overflow-y require some fixup as well in some
// cases. NS_STYLE_OVERFLOW_VISIBLE and NS_STYLE_OVERFLOW_CLIP are
// meaningful only when used in both dimensions.
// cases. NS_STYLE_OVERFLOW_VISIBLE is meaningful only when used in both dimensions.
// NS_STYLE_OVERFLOW_CLIP is now a standard value and should be preserved.
if (display->mOverflowX != display->mOverflowY &&
(display->mOverflowX == NS_STYLE_OVERFLOW_VISIBLE ||
display->mOverflowX == NS_STYLE_OVERFLOW_CLIP ||
display->mOverflowY == NS_STYLE_OVERFLOW_VISIBLE ||
display->mOverflowY == NS_STYLE_OVERFLOW_CLIP)) {
display->mOverflowY == NS_STYLE_OVERFLOW_VISIBLE)) {
// We can't store in the rule tree since a more specific rule might
// change these conditions.
conditions.SetUncacheable();
// NS_STYLE_OVERFLOW_CLIP is a deprecated value, so if it's specified
// in only one dimension, convert it to NS_STYLE_OVERFLOW_HIDDEN.
if (display->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
display->mOverflowX = NS_STYLE_OVERFLOW_HIDDEN;
}
if (display->mOverflowY == NS_STYLE_OVERFLOW_CLIP) {
display->mOverflowY = NS_STYLE_OVERFLOW_HIDDEN;
}
// If 'visible' is specified but doesn't match the other dimension, it
// turns into 'auto'.
if (display->mOverflowX == NS_STYLE_OVERFLOW_VISIBLE) {
display->mOverflowX = NS_STYLE_OVERFLOW_AUTO;
}
if (display->mOverflowY == NS_STYLE_OVERFLOW_VISIBLE) {
display->mOverflowY = NS_STYLE_OVERFLOW_AUTO;
}
// Note: clip values are now preserved as-is when axes differ
}
// When 'contain: paint', update overflow from 'visible' to 'clip'.