Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing crash when overflowing tables

Browse Source
This commit is contained in:
mjudge%netscape.com 2000-05-13 09:02:27 +00:00
parent 45dff76e4c
commit c63528bad2
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -1676,13 +1676,10 @@ nsTableRowGroupFrame::GetLine(PRInt32 aLineNumber, nsIFrame** aFirstFrameOnLine,
NS_ENSURE_ARG_POINTER(aNumFramesOnLine);
NS_ENSURE_ARG_POINTER(aLineFlags);
nsIFrame* tableFrame;
nsTableFrame* parentFrame;
nsresult result = GetParent(&tableFrame);
if(NS_FAILED(result) || !tableFrame)
return result?result:NS_ERROR_FAILURE;
nsTableFrame* parentFrame = nsnull;
if (NS_FAILED(nsTableFrame::GetTableFrame(this, parentFrame)))
return NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tableFrame;
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;
@ -1728,13 +1725,8 @@ nsTableRowGroupFrame::FindFrameAt(PRInt32 aLineNumber, nscoord aX, nsIFrame** aF
nsRect& tempRectRef = tempRect;
nsresult rv;
nsTableFrame* parentFrame;
rv = GetParent(&tempFrame);
if(NS_FAILED(rv) || !tempFrame)
return rv?rv:NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tempFrame;
nsTableFrame* parentFrame = nsnull;
rv = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;
@ -1795,11 +1787,8 @@ nsTableRowGroupFrame::GetNextSibling(nsIFrame*& aFrame, PRInt32 aLineNumber)
return result?result:NS_ERROR_FAILURE;
nsIFrame* tempFrame;
nsTableFrame* parentFrame;
nsresult rv = GetParent(&tempFrame);
if(NS_FAILED(rv) || !tempFrame)
return rv?rv:NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tempFrame;
nsTableFrame* parentFrame = nsnull;
result = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;

25
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -1676,13 +1676,10 @@ nsTableRowGroupFrame::GetLine(PRInt32 aLineNumber, nsIFrame** aFirstFrameOnLine,
NS_ENSURE_ARG_POINTER(aNumFramesOnLine);
NS_ENSURE_ARG_POINTER(aLineFlags);
nsIFrame* tableFrame;
nsTableFrame* parentFrame;
nsresult result = GetParent(&tableFrame);
if(NS_FAILED(result) || !tableFrame)
return result?result:NS_ERROR_FAILURE;
nsTableFrame* parentFrame = nsnull;
if (NS_FAILED(nsTableFrame::GetTableFrame(this, parentFrame)))
return NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tableFrame;
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;
@ -1728,13 +1725,8 @@ nsTableRowGroupFrame::FindFrameAt(PRInt32 aLineNumber, nscoord aX, nsIFrame** aF
nsRect& tempRectRef = tempRect;
nsresult rv;
nsTableFrame* parentFrame;
rv = GetParent(&tempFrame);
if(NS_FAILED(rv) || !tempFrame)
return rv?rv:NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tempFrame;
nsTableFrame* parentFrame = nsnull;
rv = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;
@ -1795,11 +1787,8 @@ nsTableRowGroupFrame::GetNextSibling(nsIFrame*& aFrame, PRInt32 aLineNumber)
return result?result:NS_ERROR_FAILURE;
nsIFrame* tempFrame;
nsTableFrame* parentFrame;
nsresult rv = GetParent(&tempFrame);
if(NS_FAILED(rv) || !tempFrame)
return rv?rv:NS_ERROR_FAILURE;
parentFrame = (nsTableFrame*)tempFrame;
nsTableFrame* parentFrame = nsnull;
result = nsTableFrame::GetTableFrame(this, parentFrame);
nsTableCellMap* cellMap = parentFrame->GetCellMap();
if(!cellMap)
return NS_ERROR_FAILURE;