Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

56950 "SeaMonkey crash in css code" (Netscape_20000922_BRANCH). Check error codes when constructing a DocElementTableFrame. r=attinasi, sr=buster, a=phil.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/Netscape_20000922_BRANCH@81726 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pierre%netscape.com
2000-10-25 04:33:07 +00:00
parent 646b738a33
commit 275a44a30e
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@@ -3186,6 +3186,10 @@ nsCSSFrameConstructor::ConstructDocElementTableFrame(nsIPresShell* aPresS
ConstructFrame(aPresShell, aPresContext, state, aDocElement, aParentFrame, frameItems);
aNewTableFrame = frameItems.childList;
if (!aNewTableFrame) {
NS_WARNING("cannot get table contentFrame");
return NS_ERROR_FAILURE;
}
return NS_OK;
}
@@ -3272,6 +3276,8 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell,
*/
aNewFrame = nsnull;
if (!mTempFrameTreeState)
aPresShell->CaptureHistoryState(getter_AddRefs(mTempFrameTreeState));
@@ -3340,12 +3346,16 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell,
nsIFrame* contentFrame = nsnull;
PRBool isBlockFrame = PR_FALSE;
nsresult rv;
if (docElemIsTable) {
// if the document is a table then just populate it.
ConstructDocElementTableFrame(aPresShell, aPresContext, aDocElement,
rv = ConstructDocElementTableFrame(aPresShell, aPresContext, aDocElement,
aParentFrame, contentFrame,
aState.mFrameState);
if (NS_FAILED(rv)) {
return rv;
}
contentFrame->GetStyleContext(getter_AddRefs(styleContext));
} else {
// otherwise build a box or a block
@@ -3353,12 +3363,18 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell* aPresShell,
PRInt32 nameSpaceID;
if (NS_SUCCEEDED(aDocElement->GetNameSpaceID(nameSpaceID)) &&
nameSpaceID == nsXULAtoms::nameSpaceID) {
NS_NewBoxFrame(aPresShell, &contentFrame, PR_TRUE);
rv = NS_NewBoxFrame(aPresShell, &contentFrame, PR_TRUE);
if (NS_FAILED(rv)) {
return rv;
}
}
else
#endif
{
NS_NewDocumentElementFrame(aPresShell, &contentFrame);
rv = NS_NewDocumentElementFrame(aPresShell, &contentFrame);
if (NS_FAILED(rv)) {
return rv;
}
isBlockFrame = PR_TRUE;
// Since we always create a block frame, we need to make sure that the