зеркало из https://github.com/mozilla/gecko-dev.git
Bug 369150, r+sr=roc
This commit is contained in:
Родитель
6e752fb3b8
Коммит
ccf98274c5
|
@ -1009,13 +1009,19 @@ nsHTMLFramesetFrame::Reflow(nsPresContext* aPresContext,
|
||||||
height -= (mNumRows - 1) * borderWidth;
|
height -= (mNumRows - 1) * borderWidth;
|
||||||
if (height < 0) height = 0;
|
if (height < 0) height = 0;
|
||||||
|
|
||||||
if (!mDrag.mActive) {
|
|
||||||
nsCOMPtr<nsIFrameSetElement> ourContent(do_QueryInterface(mContent));
|
nsCOMPtr<nsIFrameSetElement> ourContent(do_QueryInterface(mContent));
|
||||||
NS_ASSERTION(ourContent, "Someone gave us a broken frameset element!");
|
NS_ASSERTION(ourContent, "Someone gave us a broken frameset element!");
|
||||||
const nsFramesetSpec* rowSpecs = nsnull;
|
const nsFramesetSpec* rowSpecs = nsnull;
|
||||||
const nsFramesetSpec* colSpecs = nsnull;
|
const nsFramesetSpec* colSpecs = nsnull;
|
||||||
ourContent->GetRowSpec(&mNumRows, &rowSpecs);
|
PRInt32 rows = 0;
|
||||||
ourContent->GetColSpec(&mNumCols, &colSpecs);
|
PRInt32 cols = 0;
|
||||||
|
ourContent->GetRowSpec(&rows, &rowSpecs);
|
||||||
|
ourContent->GetColSpec(&cols, &colSpecs);
|
||||||
|
// If the number of cols or rows has changed, the frame for the frameset
|
||||||
|
// will be re-created.
|
||||||
|
NS_ENSURE_STATE(mNumRows == rows && mNumCols == cols);
|
||||||
|
|
||||||
|
if (!mDrag.mActive) {
|
||||||
CalculateRowCol(aPresContext, width, mNumCols, colSpecs, mColSizes);
|
CalculateRowCol(aPresContext, width, mNumCols, colSpecs, mColSizes);
|
||||||
CalculateRowCol(aPresContext, height, mNumRows, rowSpecs, mRowSizes);
|
CalculateRowCol(aPresContext, height, mNumRows, rowSpecs, mRowSizes);
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче