mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 16:25:38 +00:00
Backed out changeset e514b3f35198 (bug 1682929) for crashtest failures in layout/generic/crashtests/553504-1.xhtml
This commit is contained in:
parent
23bd509be5
commit
963794deaa
@ -1100,7 +1100,7 @@ int32_t nsLayoutUtils::DoCompareTreePosition(
|
||||
// TODO: remove the uglyness, see bug 598468.
|
||||
NS_ASSERTION(gPreventAssertInCompareTreePosition || parent,
|
||||
"no common ancestor at all???");
|
||||
#endif // DEBUG
|
||||
#endif // DEBUG
|
||||
if (!parent) { // different documents??
|
||||
return 0;
|
||||
}
|
||||
@ -4572,21 +4572,21 @@ static nscoord AddIntrinsicSizeOffset(
|
||||
nscoord coordOutsideSize = 0;
|
||||
|
||||
if (!(aFlags & nsLayoutUtils::IGNORE_PADDING)) {
|
||||
coordOutsideSize = NSCoordSaturatingAdd(coordOutsideSize, aOffsets.padding);
|
||||
coordOutsideSize += aOffsets.padding;
|
||||
}
|
||||
|
||||
coordOutsideSize = NSCoordSaturatingAdd(coordOutsideSize, aOffsets.border);
|
||||
coordOutsideSize += aOffsets.border;
|
||||
|
||||
if (aBoxSizing == StyleBoxSizing::Border) {
|
||||
min = NSCoordSaturatingAdd(min, coordOutsideSize);
|
||||
min += coordOutsideSize;
|
||||
result = NSCoordSaturatingAdd(result, coordOutsideSize);
|
||||
|
||||
coordOutsideSize = 0;
|
||||
}
|
||||
|
||||
coordOutsideSize = NSCoordSaturatingAdd(coordOutsideSize, aOffsets.margin);
|
||||
coordOutsideSize += aOffsets.margin;
|
||||
|
||||
min = NSCoordSaturatingAdd(min, coordOutsideSize);
|
||||
min += coordOutsideSize;
|
||||
result = NSCoordSaturatingAdd(result, coordOutsideSize);
|
||||
|
||||
nscoord size;
|
||||
@ -4597,13 +4597,13 @@ static nscoord AddIntrinsicSizeOffset(
|
||||
} else if (GetAbsoluteCoord(aStyleSize, size) ||
|
||||
GetIntrinsicCoord(aStyleSize, aRenderingContext, aFrame,
|
||||
PROP_WIDTH, size)) {
|
||||
result = NSCoordSaturatingAdd(size, coordOutsideSize);
|
||||
result = size + coordOutsideSize;
|
||||
}
|
||||
|
||||
nscoord maxSize = aFixedMaxSize ? *aFixedMaxSize : 0;
|
||||
if (aFixedMaxSize || GetIntrinsicCoord(aStyleMaxSize, aRenderingContext,
|
||||
aFrame, PROP_MAX_WIDTH, maxSize)) {
|
||||
maxSize = NSCoordSaturatingAdd(maxSize, coordOutsideSize);
|
||||
maxSize += coordOutsideSize;
|
||||
if (result > maxSize) {
|
||||
result = maxSize;
|
||||
}
|
||||
@ -4612,7 +4612,7 @@ static nscoord AddIntrinsicSizeOffset(
|
||||
nscoord minSize = aFixedMinSize ? *aFixedMinSize : 0;
|
||||
if (aFixedMinSize || GetIntrinsicCoord(aStyleMinSize, aRenderingContext,
|
||||
aFrame, PROP_MIN_WIDTH, minSize)) {
|
||||
minSize = NSCoordSaturatingAdd(minSize, coordOutsideSize);
|
||||
minSize += coordOutsideSize;
|
||||
if (result < minSize) {
|
||||
result = minSize;
|
||||
}
|
||||
@ -4632,7 +4632,7 @@ static nscoord AddIntrinsicSizeOffset(
|
||||
nscoord themeSize = pc->DevPixelsToAppUnits(
|
||||
aAxis == eAxisVertical ? devSize.height : devSize.width);
|
||||
// GetMinimumWidgetSize() returns a border-box width.
|
||||
themeSize = NSCoordSaturatingAdd(themeSize, aOffsets.margin);
|
||||
themeSize += aOffsets.margin;
|
||||
if (themeSize > result || !canOverride) {
|
||||
result = themeSize;
|
||||
}
|
||||
|
@ -1,12 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<style>
|
||||
* {
|
||||
display: inline-flex;
|
||||
min-inline-size: min-content;
|
||||
max-inline-size: max-content;
|
||||
padding-inline: 3207382404.097723cm !important;
|
||||
border-end-end-radius: 4080443958.323641pt 4294967295% !important;
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
</style>
|
||||
<cite><textarea></textarea></cite>
|
@ -790,4 +790,3 @@ load 1666592.html
|
||||
load 1670336.html
|
||||
HTTP load 1677518-1.html
|
||||
load 1680406.html
|
||||
asserts(4-4) load 1682929.html # Huge sizes
|
||||
|
Loading…
Reference in New Issue
Block a user