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

Bug 232838. Remove unnecessary assertions on minsizes that we don't use. r+sr=dbaron, a=choffman

This commit is contained in:
roc+%cs.cmu.edu 2004-03-12 03:35:53 +00:00
Родитель e01a4d3c15
Коммит 6a2881e43a
2 изменённых файлов: 8 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1502,15 +1502,14 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
nsBox::AddMargin(mVScrollbarBox, vMinSize);
}
NS_ASSERTION(vMinSize.width == vSize.width, "vertical scrollbar can change width");
NS_ASSERTION(hMinSize.height == hSize.height, "horizontal scrollbar can change height");
// Disable scrollbars that are too small
// Disable horizontal scrollbar first. If we have to disable only one
// scrollbar, we'd rather keep the vertical scrollbar.
// Note that we always give horizontal scrollbars their preferred height,
// never their min-height. So check that there's room for the preferred height.
if (mHasHorizontalScrollbar &&
(hMinSize.width > clientRect.width - vSize.width
|| hMinSize.height > clientRect.height)) {
|| hSize.height > clientRect.height)) {
RemoveHorizontalScrollbar(aState, scrollAreaRect, scrollBarBottom);
needsLayout = PR_TRUE;
SetAttribute(mHScrollbarBox, nsXULAtoms::curpos, 0);
@ -1521,7 +1520,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
// Now disable vertical scrollbar if necessary
if (mHasVerticalScrollbar &&
(vMinSize.height > clientRect.height - hSize.height
|| vMinSize.width > clientRect.width)) {
|| vSize.width > clientRect.width)) {
RemoveVerticalScrollbar(aState, scrollAreaRect, scrollBarRight);
needsLayout = PR_TRUE;
SetAttribute(mVScrollbarBox, nsXULAtoms::curpos, 0);

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

@ -1502,15 +1502,14 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
nsBox::AddMargin(mVScrollbarBox, vMinSize);
}
NS_ASSERTION(vMinSize.width == vSize.width, "vertical scrollbar can change width");
NS_ASSERTION(hMinSize.height == hSize.height, "horizontal scrollbar can change height");
// Disable scrollbars that are too small
// Disable horizontal scrollbar first. If we have to disable only one
// scrollbar, we'd rather keep the vertical scrollbar.
// Note that we always give horizontal scrollbars their preferred height,
// never their min-height. So check that there's room for the preferred height.
if (mHasHorizontalScrollbar &&
(hMinSize.width > clientRect.width - vSize.width
|| hMinSize.height > clientRect.height)) {
|| hSize.height > clientRect.height)) {
RemoveHorizontalScrollbar(aState, scrollAreaRect, scrollBarBottom);
needsLayout = PR_TRUE;
SetAttribute(mHScrollbarBox, nsXULAtoms::curpos, 0);
@ -1521,7 +1520,7 @@ nsGfxScrollFrameInner::Layout(nsBoxLayoutState& aState)
// Now disable vertical scrollbar if necessary
if (mHasVerticalScrollbar &&
(vMinSize.height > clientRect.height - hSize.height
|| vMinSize.width > clientRect.width)) {
|| vSize.width > clientRect.width)) {
RemoveVerticalScrollbar(aState, scrollAreaRect, scrollBarRight);
needsLayout = PR_TRUE;
SetAttribute(mVScrollbarBox, nsXULAtoms::curpos, 0);