corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parent frame determination for tables so that positioned tables end up with

Browse Source 
the placeholder in the right place.  Bug 266850, r=mats.palmgren, sr=roc
This commit is contained in:
bzbarsky@mit.edu
2004-11-04 18:53:05 +00:00
parent 5434518dee
commit 00da18749f
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -2395,7 +2395,7 @@ nsCSSFrameConstructor::CreatePseudoTableFrame(nsIPresShell* aPresShel
// construct the pseudo outer and inner as part of the pseudo frames // construct the pseudo outer and inner as part of the pseudo frames
nsFrameItems items; nsFrameItems items;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, parentContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, parentContent,
parentFrame, parentFrame, childStyle, aTableCreator, parentFrame, childStyle, aTableCreator,
PR_TRUE, items, pseudoOuter.mFrame, PR_TRUE, items, pseudoOuter.mFrame,
pseudoInner.mFrame); pseudoInner.mFrame);
@@ -2901,7 +2901,6 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell* aPresShell,
nsPresContext* aPresContext, nsPresContext* aPresContext,
nsFrameConstructorState& aState, nsFrameConstructorState& aState,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aGeometricParent,
nsIFrame* aContentParent, nsIFrame* aContentParent,
nsStyleContext* aStyleContext, nsStyleContext* aStyleContext,
nsTableCreator& aTableCreator, nsTableCreator& aTableCreator,
@@ -2911,19 +2910,18 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell* aPresShell,
nsIFrame*& aNewInnerFrame) nsIFrame*& aNewInnerFrame)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (!aPresShell || !aPresContext || !aGeometricParent) return rv;
// Create the outer table frame which holds the caption and inner table frame // Create the outer table frame which holds the caption and inner table frame
aTableCreator.CreateTableOuterFrame(&aNewOuterFrame); aTableCreator.CreateTableOuterFrame(&aNewOuterFrame);
nsIFrame* parentFrame = aGeometricParent; nsIFrame* parentFrame = aContentParent;
nsFrameItems* frameItems = &aChildItems; nsFrameItems* frameItems = &aChildItems;
// We may need to push a float containing block // We may need to push a float containing block
nsFrameConstructorSaveState floatSaveState; nsFrameConstructorSaveState floatSaveState;
if (!aIsPseudo) { if (!aIsPseudo) {
// this frame may have a pseudo parent // this frame may have a pseudo parent
PRBool hasPseudoParent = PR_FALSE; PRBool hasPseudoParent = PR_FALSE;
GetParentFrame(aPresShell, aPresContext, aTableCreator, *aGeometricParent, GetParentFrame(aPresShell, aPresContext, aTableCreator, *parentFrame,
nsLayoutAtoms::tableOuterFrame, aState, parentFrame, hasPseudoParent); nsLayoutAtoms::tableOuterFrame, aState, parentFrame, hasPseudoParent);
if (!hasPseudoParent && !aState.mPseudoFrames.IsEmpty()) { if (!hasPseudoParent && !aState.mPseudoFrames.IsEmpty()) {
ProcessPseudoFrames(aPresContext, aState.mPseudoFrames, aChildItems); ProcessPseudoFrames(aPresContext, aState.mPseudoFrames, aChildItems);
@@ -3568,7 +3566,7 @@ nsCSSFrameConstructor::TableProcessChild(nsIPresShell* aPresShell,
// construct the table frame // construct the table frame
nsIFrame* innerTableFrame; nsIFrame* innerTableFrame;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aChildContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aChildContent,
aParentFrame, aParentFrame, childStyleContext, aParentFrame, childStyleContext,
aTableCreator, PR_FALSE, aChildItems, aTableCreator, PR_FALSE, aChildItems,
childFrame, innerTableFrame); childFrame, innerTableFrame);
if (NS_SUCCEEDED(rv) && pageBreakAfter) { if (NS_SUCCEEDED(rv) && pageBreakAfter) {
@@ -6588,8 +6586,6 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresShell* aPre
} }
nsIFrame* innerTable; nsIFrame* innerTable;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent,
aState.GetGeometricParent(aDisplay,
adjParentFrame),
adjParentFrame, aStyleContext, adjParentFrame, aStyleContext,
tableCreator, PR_FALSE, aFrameItems, newFrame, tableCreator, PR_FALSE, aFrameItems, newFrame,
innerTable); innerTable);
@@ -6879,7 +6875,7 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
nsIFrame* innerTable; nsIFrame* innerTable;
nsMathMLmtableCreator mathTableCreator(aPresShell); nsMathMLmtableCreator mathTableCreator(aPresShell);
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent,
blockFrame, blockFrame, tableContext, blockFrame, tableContext,
mathTableCreator, PR_FALSE, tempItems, outerTable, mathTableCreator, PR_FALSE, tempItems, outerTable,
innerTable); innerTable);
// Note: table construction function takes care of initializing the frame, // Note: table construction function takes care of initializing the frame,

1
layout/base/nsCSSFrameConstructor.h
View File

@@ -285,7 +285,6 @@ private:
nsPresContext* aPresContext, nsPresContext* aPresContext,
nsFrameConstructorState& aState, nsFrameConstructorState& aState,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aGeometricParent,
nsIFrame* aContentParent, nsIFrame* aContentParent,
nsStyleContext* aStyleContext, nsStyleContext* aStyleContext,
nsTableCreator& aTableCreator, nsTableCreator& aTableCreator,

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

@@ -2395,7 +2395,7 @@ nsCSSFrameConstructor::CreatePseudoTableFrame(nsIPresShell* aPresShel
// construct the pseudo outer and inner as part of the pseudo frames // construct the pseudo outer and inner as part of the pseudo frames
nsFrameItems items; nsFrameItems items;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, parentContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, parentContent,
parentFrame, parentFrame, childStyle, aTableCreator, parentFrame, childStyle, aTableCreator,
PR_TRUE, items, pseudoOuter.mFrame, PR_TRUE, items, pseudoOuter.mFrame,
pseudoInner.mFrame); pseudoInner.mFrame);
@@ -2901,7 +2901,6 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell* aPresShell,
nsPresContext* aPresContext, nsPresContext* aPresContext,
nsFrameConstructorState& aState, nsFrameConstructorState& aState,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aGeometricParent,
nsIFrame* aContentParent, nsIFrame* aContentParent,
nsStyleContext* aStyleContext, nsStyleContext* aStyleContext,
nsTableCreator& aTableCreator, nsTableCreator& aTableCreator,
@@ -2911,19 +2910,18 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell* aPresShell,
nsIFrame*& aNewInnerFrame) nsIFrame*& aNewInnerFrame)
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (!aPresShell || !aPresContext || !aGeometricParent) return rv;
// Create the outer table frame which holds the caption and inner table frame // Create the outer table frame which holds the caption and inner table frame
aTableCreator.CreateTableOuterFrame(&aNewOuterFrame); aTableCreator.CreateTableOuterFrame(&aNewOuterFrame);
nsIFrame* parentFrame = aGeometricParent; nsIFrame* parentFrame = aContentParent;
nsFrameItems* frameItems = &aChildItems; nsFrameItems* frameItems = &aChildItems;
// We may need to push a float containing block // We may need to push a float containing block
nsFrameConstructorSaveState floatSaveState; nsFrameConstructorSaveState floatSaveState;
if (!aIsPseudo) { if (!aIsPseudo) {
// this frame may have a pseudo parent // this frame may have a pseudo parent
PRBool hasPseudoParent = PR_FALSE; PRBool hasPseudoParent = PR_FALSE;
GetParentFrame(aPresShell, aPresContext, aTableCreator, *aGeometricParent, GetParentFrame(aPresShell, aPresContext, aTableCreator, *parentFrame,
nsLayoutAtoms::tableOuterFrame, aState, parentFrame, hasPseudoParent); nsLayoutAtoms::tableOuterFrame, aState, parentFrame, hasPseudoParent);
if (!hasPseudoParent && !aState.mPseudoFrames.IsEmpty()) { if (!hasPseudoParent && !aState.mPseudoFrames.IsEmpty()) {
ProcessPseudoFrames(aPresContext, aState.mPseudoFrames, aChildItems); ProcessPseudoFrames(aPresContext, aState.mPseudoFrames, aChildItems);
@@ -3568,7 +3566,7 @@ nsCSSFrameConstructor::TableProcessChild(nsIPresShell* aPresShell,
// construct the table frame // construct the table frame
nsIFrame* innerTableFrame; nsIFrame* innerTableFrame;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aChildContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aChildContent,
aParentFrame, aParentFrame, childStyleContext, aParentFrame, childStyleContext,
aTableCreator, PR_FALSE, aChildItems, aTableCreator, PR_FALSE, aChildItems,
childFrame, innerTableFrame); childFrame, innerTableFrame);
if (NS_SUCCEEDED(rv) && pageBreakAfter) { if (NS_SUCCEEDED(rv) && pageBreakAfter) {
@@ -6588,8 +6586,6 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresShell* aPre
} }
nsIFrame* innerTable; nsIFrame* innerTable;
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent,
aState.GetGeometricParent(aDisplay,
adjParentFrame),
adjParentFrame, aStyleContext, adjParentFrame, aStyleContext,
tableCreator, PR_FALSE, aFrameItems, newFrame, tableCreator, PR_FALSE, aFrameItems, newFrame,
innerTable); innerTable);
@@ -6879,7 +6875,7 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell* aPresShell,
nsIFrame* innerTable; nsIFrame* innerTable;
nsMathMLmtableCreator mathTableCreator(aPresShell); nsMathMLmtableCreator mathTableCreator(aPresShell);
rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent, rv = ConstructTableFrame(aPresShell, aPresContext, aState, aContent,
blockFrame, blockFrame, tableContext, blockFrame, tableContext,
mathTableCreator, PR_FALSE, tempItems, outerTable, mathTableCreator, PR_FALSE, tempItems, outerTable,
innerTable); innerTable);
// Note: table construction function takes care of initializing the frame, // Note: table construction function takes care of initializing the frame,

1
layout/html/style/src/nsCSSFrameConstructor.h
View File

@@ -285,7 +285,6 @@ private:
nsPresContext* aPresContext, nsPresContext* aPresContext,
nsFrameConstructorState& aState, nsFrameConstructorState& aState,
nsIContent* aContent, nsIContent* aContent,
nsIFrame* aGeometricParent,
nsIFrame* aContentParent, nsIFrame* aContentParent,
nsStyleContext* aStyleContext, nsStyleContext* aStyleContext,
nsTableCreator& aTableCreator, nsTableCreator& aTableCreator,