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

bug 44523 - Get the actual rg from the cell in AppendCell rather than use the row index. sr=attinasi

Browse Source
This commit is contained in:
karnaze%netscape.com 2001-03-28 21:25:13 +00:00
parent bc45e0b73b
commit 8825aad0b0
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/html/table/src/nsCellMap.cpp
View File

@ -311,10 +311,16 @@ nsTableCellMap::AppendCell(nsTableCellFrame& aCellFrame,
PRBool aRebuildIfNecessary)
{
NS_ASSERTION(&aCellFrame == aCellFrame.GetFirstInFlow(), "invalid call on continuing frame");
nsIFrame* rgFrame = nsnull;
aCellFrame.GetParent(&rgFrame); // get the row
if (!rgFrame) return 0;
rgFrame->GetParent(&rgFrame); // get the row group
if (!rgFrame) return 0;
PRInt32 rowIndex = aRowIndex;
nsCellMap* cellMap = mFirstMap;
while (cellMap) {
if (cellMap->GetRowCount() > rowIndex) {
if (cellMap->GetRowGroup() == rgFrame) {
return cellMap->AppendCell(*this, aCellFrame, rowIndex, aRebuildIfNecessary);
}
rowIndex -= cellMap->GetRowCount();

9
layout/html/table/src/nsCellMap.h
View File

@ -211,8 +211,8 @@ public:
PRInt32 GetNumCellsOriginatingInRow(PRInt32 aRowIndex) const;
PRInt32 GetNumCellsOriginatingInCol(PRInt32 aColIndex) const;
/** return the actual number of rows in the table represented by this CellMap */
PRInt32 GetRowCount() const;
/** return the number of rows in the table represented by this CellMap */
PRInt32 GetRowCount(PRBool aConsiderDeadRowSpanRows = PR_FALSE) const;
nsTableCellFrame* GetCellInfoAt(nsTableCellMap& aMap,
PRInt32 aRowX,
@ -374,9 +374,10 @@ inline nsTableRowGroupFrame* nsCellMap::GetRowGroup() const
return mRowGroupFrame;
}
inline PRInt32 nsCellMap::GetRowCount() const
inline PRInt32 nsCellMap::GetRowCount(PRBool aConsiderDeadRowSpanRows) const
{
return mRowCount;
PRInt32 rowCount = (aConsiderDeadRowSpanRows) ? mRows.Count() : mRowCount;
return rowCount;
}
// nsColInfo

8
layout/tables/nsCellMap.cpp
View File

@ -311,10 +311,16 @@ nsTableCellMap::AppendCell(nsTableCellFrame& aCellFrame,
PRBool aRebuildIfNecessary)
{
NS_ASSERTION(&aCellFrame == aCellFrame.GetFirstInFlow(), "invalid call on continuing frame");
nsIFrame* rgFrame = nsnull;
aCellFrame.GetParent(&rgFrame); // get the row
if (!rgFrame) return 0;
rgFrame->GetParent(&rgFrame); // get the row group
if (!rgFrame) return 0;
PRInt32 rowIndex = aRowIndex;
nsCellMap* cellMap = mFirstMap;
while (cellMap) {
if (cellMap->GetRowCount() > rowIndex) {
if (cellMap->GetRowGroup() == rgFrame) {
return cellMap->AppendCell(*this, aCellFrame, rowIndex, aRebuildIfNecessary);
}
rowIndex -= cellMap->GetRowCount();

9
layout/tables/nsCellMap.h
View File

@ -211,8 +211,8 @@ public:
PRInt32 GetNumCellsOriginatingInRow(PRInt32 aRowIndex) const;
PRInt32 GetNumCellsOriginatingInCol(PRInt32 aColIndex) const;
/** return the actual number of rows in the table represented by this CellMap */
PRInt32 GetRowCount() const;
/** return the number of rows in the table represented by this CellMap */
PRInt32 GetRowCount(PRBool aConsiderDeadRowSpanRows = PR_FALSE) const;
nsTableCellFrame* GetCellInfoAt(nsTableCellMap& aMap,
PRInt32 aRowX,
@ -374,9 +374,10 @@ inline nsTableRowGroupFrame* nsCellMap::GetRowGroup() const
return mRowGroupFrame;
}
inline PRInt32 nsCellMap::GetRowCount() const
inline PRInt32 nsCellMap::GetRowCount(PRBool aConsiderDeadRowSpanRows) const
{
return mRowCount;
PRInt32 rowCount = (aConsiderDeadRowSpanRows) ? mRows.Count() : mRowCount;
return rowCount;
}
// nsColInfo