From 6e512c8d9f8a04ec1e13412c2a2b8d7075665ec4 Mon Sep 17 00:00:00 2001 From: "mats.palmgren%bredband.net" Date: Mon, 17 Oct 2005 00:03:05 +0000 Subject: [PATCH] Return the frame count for the given line 'aLineNumber', not the line where we find the first frame. b=308052 r=bernd sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@182348 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrame.cpp | 2 +- mozilla/layout/tables/nsTableRowGroupFrame.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 7b1e4242655..4096354de69 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -3196,7 +3196,7 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext, //result = lastFrame->GetNextSibling(&lastFrame, searchingLine); result = it->GetNextSiblingOnLine(lastFrame, searchingLine); if (NS_FAILED(result) || !lastFrame){ - NS_ASSERTION(0,"should not be reached nsFrame\n"); + NS_ERROR("GetLine promised more frames than could be found"); return NS_ERROR_FAILURE; } } diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index e52067c4a9a..7dc05e3c3c2 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -1879,6 +1879,7 @@ nsTableRowGroupFrame::GetLine(PRInt32 aLineNumber, if (!firstCellData) return NS_ERROR_FAILURE; + *aNumFramesOnLine = cellMap->GetNumCellsOriginatingInRow(aLineNumber); *aFirstFrameOnLine = (nsIFrame*)firstCellData->GetCellFrame(); if (!(*aFirstFrameOnLine)) { @@ -1889,7 +1890,10 @@ nsTableRowGroupFrame::GetLine(PRInt32 aLineNumber, *aFirstFrameOnLine = (nsIFrame*)firstCellData->GetCellFrame(); } } - *aNumFramesOnLine = cellMap->GetNumCellsOriginatingInRow(aLineNumber); + if (!(*aFirstFrameOnLine)) { + NS_ERROR("Failed to find cell frame for cell data"); + *aNumFramesOnLine = 0; + } return NS_OK; }