Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 235558. We don't really want to consider computed maximum widths after all. r+sr=dbaron,a=asa

Browse Source
This commit is contained in:
roc+%cs.cmu.edu 2004-03-27 02:44:26 +00:00
parent a032d5bd44
commit 73f0030896
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsGfxScrollFrame.cpp
View File

@ -718,14 +718,9 @@ nsGfxScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
computedSize = nsSize(HTMLState->mComputedWidth, HTMLState->mComputedHeight);
// If we know the computed size, then that's the effective maximum
computedMax = computedSize;
// Get CSS maxima where we don't have a computed size
if (computedMax.width == NS_INTRINSICSIZE) {
computedMax.width = HTMLState->mComputedMaxWidth;
}
if (computedMax.height == NS_INTRINSICSIZE) {
computedMax.height = HTMLState->mComputedMaxHeight;
}
// One could imagine using other constraints in computedMax, but it doesn't
// really work. See bug 237622.
// Pass a constraint to the block if we have at least one constraint
// and our size is not fixed
if (((computedSize.width == NS_INTRINSICSIZE)

11
layout/html/base/src/nsGfxScrollFrame.cpp
View File

@ -718,14 +718,9 @@ nsGfxScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
computedSize = nsSize(HTMLState->mComputedWidth, HTMLState->mComputedHeight);
// If we know the computed size, then that's the effective maximum
computedMax = computedSize;
// Get CSS maxima where we don't have a computed size
if (computedMax.width == NS_INTRINSICSIZE) {
computedMax.width = HTMLState->mComputedMaxWidth;
}
if (computedMax.height == NS_INTRINSICSIZE) {
computedMax.height = HTMLState->mComputedMaxHeight;
}
// One could imagine using other constraints in computedMax, but it doesn't
// really work. See bug 237622.
// Pass a constraint to the block if we have at least one constraint
// and our size is not fixed
if (((computedSize.width == NS_INTRINSICSIZE)