corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an assert that was getting hit for absolutely positioned elements

Browse Source
This commit is contained in:
troy@netscape.com
1999-01-15 04:28:17 +00:00
parent f98681407a
commit f673f5148c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsHTMLReflowState.cpp
View File

@@ -347,7 +347,9 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
// Initialize the 'top' and 'bottom' computed offsets // Initialize the 'top' and 'bottom' computed offsets
PRBool bottomIsAuto = PR_FALSE; PRBool bottomIsAuto = PR_FALSE;
if (eStyleUnit_Auto == aPosition->mOffset.GetTopUnit()) { if ((eStyleUnit_Auto == aPosition->mOffset.GetTopUnit()) ||
((NS_AUTOHEIGHT == containingBlockHeight) &&
(eStyleUnit_Percent == aPosition->mOffset.GetTopUnit()))) {
// Use the placeholder position // Use the placeholder position
computedOffsets.top = placeholderOffset.y; computedOffsets.top = placeholderOffset.y;
} else { } else {
@@ -355,7 +357,9 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
ComputeVerticalValue(containingBlockHeight, aPosition->mOffset.GetTopUnit(), ComputeVerticalValue(containingBlockHeight, aPosition->mOffset.GetTopUnit(),
aPosition->mOffset.GetTop(coord), computedOffsets.top); aPosition->mOffset.GetTop(coord), computedOffsets.top);
} }
if (eStyleUnit_Auto == aPosition->mOffset.GetBottomUnit()) { if ((eStyleUnit_Auto == aPosition->mOffset.GetBottomUnit()) ||
((NS_AUTOHEIGHT == containingBlockHeight) &&
(eStyleUnit_Percent == aPosition->mOffset.GetBottomUnit()))) {
if (eStyleUnit_Auto == heightUnit) { if (eStyleUnit_Auto == heightUnit) {
computedOffsets.bottom = 0; computedOffsets.bottom = 0;
} else { } else {

8
layout/html/base/src/nsHTMLReflowState.cpp
View File

@@ -347,7 +347,9 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
// Initialize the 'top' and 'bottom' computed offsets // Initialize the 'top' and 'bottom' computed offsets
PRBool bottomIsAuto = PR_FALSE; PRBool bottomIsAuto = PR_FALSE;
if (eStyleUnit_Auto == aPosition->mOffset.GetTopUnit()) { if ((eStyleUnit_Auto == aPosition->mOffset.GetTopUnit()) ||
((NS_AUTOHEIGHT == containingBlockHeight) &&
(eStyleUnit_Percent == aPosition->mOffset.GetTopUnit()))) {
// Use the placeholder position // Use the placeholder position
computedOffsets.top = placeholderOffset.y; computedOffsets.top = placeholderOffset.y;
} else { } else {
@@ -355,7 +357,9 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
ComputeVerticalValue(containingBlockHeight, aPosition->mOffset.GetTopUnit(), ComputeVerticalValue(containingBlockHeight, aPosition->mOffset.GetTopUnit(),
aPosition->mOffset.GetTop(coord), computedOffsets.top); aPosition->mOffset.GetTop(coord), computedOffsets.top);
} }
if (eStyleUnit_Auto == aPosition->mOffset.GetBottomUnit()) { if ((eStyleUnit_Auto == aPosition->mOffset.GetBottomUnit()) ||
((NS_AUTOHEIGHT == containingBlockHeight) &&
(eStyleUnit_Percent == aPosition->mOffset.GetBottomUnit()))) {
if (eStyleUnit_Auto == heightUnit) { if (eStyleUnit_Auto == heightUnit) {
computedOffsets.bottom = 0; computedOffsets.bottom = 0;
} else { } else {