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

code share GetCaptionAdjustedParent between AdjustCaptionParentFrame, bug 289936 r/sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@179139 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bmlk%gmx.de
2005-08-27 18:30:36 +00:00
parent 7c97487d13
commit a91a28273f
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@@ -1802,28 +1802,6 @@ nsAutoEnqueueBinding::~nsAutoEnqueueBinding()
}
}
/**
* If the parent frame is a |tableFrame| and the child is a
* |captionFrame|, then we want to insert the frames beneath the
* |tableFrame|'s parent frame. Returns |PR_TRUE| if the parent frame
* needed to be fixed up.
*/
static PRBool
GetCaptionAdjustedParent(nsIFrame* aParentFrame,
const nsIFrame* aChildFrame,
nsIFrame** aAdjParentFrame)
{
*aAdjParentFrame = aParentFrame;
PRBool haveCaption = PR_FALSE;
if (nsLayoutAtoms::tableCaptionFrame == aChildFrame->GetType()) {
haveCaption = PR_TRUE;
if (nsLayoutAtoms::tableFrame == aParentFrame->GetType()) {
*aAdjParentFrame = aParentFrame->GetParent();
}
}
return haveCaption;
}
// Helper function that determines the child list name that aChildFrame
// is contained in
@@ -2430,7 +2408,28 @@ AdjustCaptionParentFrame(nsIFrame* aParentFrame)
}
return aParentFrame;
}
/**
* If the parent frame is a |tableFrame| and the child is a
* |captionFrame|, then we want to insert the frames beneath the
* |tableFrame|'s parent frame. Returns |PR_TRUE| if the parent frame
* needed to be fixed up.
*/
static PRBool
GetCaptionAdjustedParent(nsIFrame* aParentFrame,
const nsIFrame* aChildFrame,
nsIFrame** aAdjParentFrame)
{
*aAdjParentFrame = aParentFrame;
PRBool haveCaption = PR_FALSE;
if (nsLayoutAtoms::tableCaptionFrame == aChildFrame->GetType()) {
haveCaption = PR_TRUE;
*aAdjParentFrame = AdjustCaptionParentFrame(aParentFrame);
}
return haveCaption;
}
static nsresult
ProcessPseudoFrame(nsPresContext* aPresContext,
nsPseudoFrameData& aPseudoData,