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

Fix crashes by making CreateContinuingFrame able to deal with a frame that already has a next-in-flow. b=140948 Patch by Mats Palmgren <mats.palmgren@bredband.net>. r+sr=dbaron a=chofmann

Browse Source
This commit is contained in:
dbaron%dbaron.org 2004-04-02 00:09:57 +00:00
parent 85871d75fb
commit 2981d39de1
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layout/base/nsCSSFrameConstructor.cpp
View File

@ -10570,6 +10570,9 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresContext* aPresContext,
nsStyleContext* styleContext = aFrame->GetStyleContext();
nsIFrame* newFrame = nsnull;
nsresult rv = NS_OK;
nsIFrame* nextInFlow = nsnull;
aFrame->GetNextInFlow(&nextInFlow);
// Use the frame type to determine what type of frame to create
nsIAtom* frameType = aFrame->GetType();
@ -10750,6 +10753,10 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresContext* aPresContext,
}
if (aParentFrame->GetType() != nsLayoutAtoms::pageContentFrame) {
if (nextInFlow) {
nextInFlow->SetPrevInFlow(newFrame);
newFrame->SetNextInFlow(nextInFlow);
}
return NS_OK;
}

7
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -10570,6 +10570,9 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresContext* aPresContext,
nsStyleContext* styleContext = aFrame->GetStyleContext();
nsIFrame* newFrame = nsnull;
nsresult rv = NS_OK;
nsIFrame* nextInFlow = nsnull;
aFrame->GetNextInFlow(&nextInFlow);
// Use the frame type to determine what type of frame to create
nsIAtom* frameType = aFrame->GetType();
@ -10750,6 +10753,10 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresContext* aPresContext,
}
if (aParentFrame->GetType() != nsLayoutAtoms::pageContentFrame) {
if (nextInFlow) {
nextInFlow->SetPrevInFlow(newFrame);
newFrame->SetNextInFlow(nextInFlow);
}
return NS_OK;
}