mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

171994 - crash resizing using splitter btwn download panels. patch by roc, r=me sr=hyatt.

This commit is contained in:
blakeross%telocity.com 2002-10-01 22:53:43 +00:00
Родитель 5e18ec7aae
Коммит 7539a559b6
2 изменённых файлов: 36 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
layout/generic/nsGfxScrollFrame.cpp
Просмотреть файл

@ -715,23 +715,30 @@ nsGfxScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
// if one of the width and height is constrained,
// do smarter preferred size checking in case the scrolled frame is a block.
nsSize computedSize(aState.GetReflowState()->mComputedWidth,
aState.GetReflowState()->mComputedHeight);
nsSize oldConstrainedSize;
aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
if ((computedSize.width != NS_INTRINSICSIZE)
!= (computedSize.height != NS_INTRINSICSIZE)) {
// adjust constraints in case we have scrollbars
if (computedSize.width != NS_INTRINSICSIZE) {
computedSize.width = PR_MAX(0, computedSize.width - vSize.width);
const nsHTMLReflowState* HTMLState = aState.GetReflowState();
nsSize computedSize(NS_INTRINSICSIZE, NS_INTRINSICSIZE);
if (HTMLState != nsnull) {
computedSize.width = HTMLState->mComputedWidth;
computedSize.height = HTMLState->mComputedHeight;
if ((computedSize.width == NS_INTRINSICSIZE)
!= (computedSize.height == NS_INTRINSICSIZE)) {
// adjust constraints in case we have scrollbars
if (computedSize.width != NS_INTRINSICSIZE) {
computedSize.width = PR_MAX(0, computedSize.width - vSize.width);
}
if (computedSize.height != NS_INTRINSICSIZE) {
computedSize.height = PR_MAX(0, computedSize.height - hSize.height);
}
aState.SetScrolledBlockSizeConstraint(computedSize);
} else {
aState.SetScrolledBlockSizeConstraint(nsSize(-1,-1));
}
if (computedSize.height != NS_INTRINSICSIZE) {
computedSize.height = PR_MAX(0, computedSize.height - hSize.height);
}
aState.SetScrolledBlockSizeConstraint(computedSize);
} else {
aState.SetScrolledBlockSizeConstraint(nsSize(-1,-1));
}
nsresult rv = mInner->mScrollAreaBox->GetPrefSize(aState, aSize);
aState.SetScrolledBlockSizeConstraint(oldConstrainedSize);

29
layout/html/base/src/nsGfxScrollFrame.cpp
Просмотреть файл

@ -715,23 +715,30 @@ nsGfxScrollFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
// if one of the width and height is constrained,
// do smarter preferred size checking in case the scrolled frame is a block.
nsSize computedSize(aState.GetReflowState()->mComputedWidth,
aState.GetReflowState()->mComputedHeight);
nsSize oldConstrainedSize;
aState.GetScrolledBlockSizeConstraint(oldConstrainedSize);
if ((computedSize.width != NS_INTRINSICSIZE)
!= (computedSize.height != NS_INTRINSICSIZE)) {
// adjust constraints in case we have scrollbars
if (computedSize.width != NS_INTRINSICSIZE) {
computedSize.width = PR_MAX(0, computedSize.width - vSize.width);
const nsHTMLReflowState* HTMLState = aState.GetReflowState();
nsSize computedSize(NS_INTRINSICSIZE, NS_INTRINSICSIZE);
if (HTMLState != nsnull) {
computedSize.width = HTMLState->mComputedWidth;
computedSize.height = HTMLState->mComputedHeight;
if ((computedSize.width == NS_INTRINSICSIZE)
!= (computedSize.height == NS_INTRINSICSIZE)) {
// adjust constraints in case we have scrollbars
if (computedSize.width != NS_INTRINSICSIZE) {
computedSize.width = PR_MAX(0, computedSize.width - vSize.width);
}
if (computedSize.height != NS_INTRINSICSIZE) {
computedSize.height = PR_MAX(0, computedSize.height - hSize.height);
}
aState.SetScrolledBlockSizeConstraint(computedSize);
} else {
aState.SetScrolledBlockSizeConstraint(nsSize(-1,-1));
}
if (computedSize.height != NS_INTRINSICSIZE) {
computedSize.height = PR_MAX(0, computedSize.height - hSize.height);
}
aState.SetScrolledBlockSizeConstraint(computedSize);
} else {
aState.SetScrolledBlockSizeConstraint(nsSize(-1,-1));
}
nsresult rv = mInner->mScrollAreaBox->GetPrefSize(aState, aSize);
aState.SetScrolledBlockSizeConstraint(oldConstrainedSize);