mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

col and colgroup attribute handling 

colgroup pseudo frame for cols inserted directly into a table.  More like this to come...
This commit is contained in:
buster%netscape.com 1998-11-12 18:37:28 +00:00
Родитель b8e7c399a3
Коммит 9b8264930f
16 изменённых файлов: 276 добавлений и 91 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
content/html/content/src/nsHTMLTableColElement.cpp
Просмотреть файл

@ -165,7 +165,7 @@ nsHTMLTableColElement::StringToAttribute(nsIAtom* aAttribute,
nsGenericHTMLElement::ParseValue(aValue, 0, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::repeat) {
else if (aAttribute == nsHTMLAtoms::span) {
nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
@ -199,7 +199,7 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
ch
*/
/* ignore attributes that are of standard types
choff, repeat, width
choff, span, width
*/
if (aAttribute == nsHTMLAtoms::align) {
if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
@ -260,7 +260,16 @@ MapAttributesInto(nsIHTMLAttributes* aAttributes,
textStyle = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text);
textStyle->mVerticalAlign.SetIntValue(value.GetIntValue(), eStyleUnit_Enumerated);
}
// span: int
aAttributes->GetAttribute(nsHTMLAtoms::span, value);
if (value.GetUnit() == eHTMLUnit_Integer)
{
nsStyleTable *tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mSpan = value.GetIntValue();
}
}
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aContext, aPresContext);
}

10
content/html/content/src/nsHTMLTableColGroupElement.cpp
Просмотреть файл

@ -154,7 +154,7 @@ nsHTMLTableColGroupElement::StringToAttribute(nsIAtom* aAttribute,
nsGenericHTMLElement::ParseValue(aValue, 0, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::repeat) {
else if (aAttribute == nsHTMLAtoms::span) {
nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
@ -249,6 +249,14 @@ MapAttributesInto(nsIHTMLAttributes* aAttributes,
textStyle = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text);
textStyle->mVerticalAlign.SetIntValue(value.GetIntValue(), eStyleUnit_Enumerated);
}
// span: int
aAttributes->GetAttribute(nsHTMLAtoms::span, value);
if (value.GetUnit() == eHTMLUnit_Integer)
{
nsStyleTable *tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mSpan = value.GetIntValue();
}
}
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aContext, aPresContext);
}

35
content/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -962,6 +962,7 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
PRInt32 count;
aContent->ChildCount(count);
for (PRInt32 i = 0; i < count; i++) {
nsIFrame* grandChildList=nsnull; // to be used only when pseudoframes need to be created
nsIContent* childContent;
aContent->ChildAt(i, childContent);
@ -1000,8 +1001,28 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
break;
case NS_STYLE_DISPLAY_TABLE_COLUMN:
NS_NewTableColFrame(childContent, innerFrame, frame);
{
//XXX: Peter - please code review and remove this comment when all is well.
// When we're done here, "frame" will be the pseudo colgroup frame and will be dealt with normally after the swtich.
// The the column itself will have already been dealt with
nsIStyleContext* colStyleContext;
nsIStyleContext* colGroupStyleContext;
colGroupStyleContext = aPresContext->ResolvePseudoStyleContextFor (childContent,
nsHTMLAtoms::columnPseudo,
aStyleContext);
nsStyleDisplay *colGroupDisplay = (nsStyleDisplay *)colGroupStyleContext->GetMutableStyleData(eStyleStruct_Display);
colGroupDisplay->mDisplay = NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP;
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
childStyleContext = colGroupStyleContext; // the col group style context will get set to childStyleContext after the switch ends.
// need to resolve the style context for the column again to be sure it's a child of the colgroup style context
colStyleContext = aPresContext->ResolveStyleContextFor(childContent, colGroupStyleContext);
nsIFrame *colFrame;
NS_NewTableColFrame(childContent, frame, colFrame);
colFrame->SetInitialChildList(*aPresContext, nsnull, nsnull);
colFrame->SetStyleContext(aPresContext, colStyleContext);
grandChildList = colFrame;
break;
}
case NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP:
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
@ -1019,9 +1040,13 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
frame->SetStyleContext(aPresContext, childStyleContext);
// Process the children, and set the frame's initial child list
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
frame->SetInitialChildList(*aPresContext, nsnull, childChildList);
if (nsnull==grandChildList)
{
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
grandChildList = childChildList;
}
frame->SetInitialChildList(*aPresContext, nsnull, grandChildList);
// Link the frame into the child list
if (nsnull == lastChildFrame) {
@ -1329,6 +1354,8 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresContext,
case NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP:
// XXX We should check for being inside of a table. If there's a missing
// table then create an anonynmous table frame
// XXX: see ConstructTableFrame for a prototype of how this should be done,
// and propagate similar logic to other table elements
{
nsIFrame *parentFrame;
rv = GetAdjustedParentFrame(aParentFrame, aDisplay->mDisplay, parentFrame);

2
layout/base/public/nsIStyleContext.h
Просмотреть файл

@ -168,7 +168,7 @@ struct nsStyleTable: public nsStyleStruct {
nsStyleCoord mCellPadding; // [reset]
nsStyleCoord mCellSpacing; // [reset]
PRInt32 mCols; // [reset] an integer if set, or see nsStyleConsts.h NS_STYLE_TABLE_COLS_*
PRInt32 mSpan; // [reset] the number of columns spanned by a colgroup
PRInt32 mSpan; // [reset] the number of columns spanned by a colgroup or col
protected:
nsStyleTable(void);

13
layout/html/content/src/nsHTMLTableColElement.cpp
Просмотреть файл

@ -165,7 +165,7 @@ nsHTMLTableColElement::StringToAttribute(nsIAtom* aAttribute,
nsGenericHTMLElement::ParseValue(aValue, 0, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::repeat) {
else if (aAttribute == nsHTMLAtoms::span) {
nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
@ -199,7 +199,7 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
ch
*/
/* ignore attributes that are of standard types
choff, repeat, width
choff, span, width
*/
if (aAttribute == nsHTMLAtoms::align) {
if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
@ -260,7 +260,16 @@ MapAttributesInto(nsIHTMLAttributes* aAttributes,
textStyle = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text);
textStyle->mVerticalAlign.SetIntValue(value.GetIntValue(), eStyleUnit_Enumerated);
}
// span: int
aAttributes->GetAttribute(nsHTMLAtoms::span, value);
if (value.GetUnit() == eHTMLUnit_Integer)
{
nsStyleTable *tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mSpan = value.GetIntValue();
}
}
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aContext, aPresContext);
}

10
layout/html/content/src/nsHTMLTableColGroupElement.cpp
Просмотреть файл

@ -154,7 +154,7 @@ nsHTMLTableColGroupElement::StringToAttribute(nsIAtom* aAttribute,
nsGenericHTMLElement::ParseValue(aValue, 0, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::repeat) {
else if (aAttribute == nsHTMLAtoms::span) {
nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer);
return NS_CONTENT_ATTR_HAS_VALUE;
}
@ -249,6 +249,14 @@ MapAttributesInto(nsIHTMLAttributes* aAttributes,
textStyle = (nsStyleText*)aContext->GetMutableStyleData(eStyleStruct_Text);
textStyle->mVerticalAlign.SetIntValue(value.GetIntValue(), eStyleUnit_Enumerated);
}
// span: int
aAttributes->GetAttribute(nsHTMLAtoms::span, value);
if (value.GetUnit() == eHTMLUnit_Integer)
{
nsStyleTable *tableStyle = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
tableStyle->mSpan = value.GetIntValue();
}
}
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aContext, aPresContext);
}

35
layout/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -962,6 +962,7 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
PRInt32 count;
aContent->ChildCount(count);
for (PRInt32 i = 0; i < count; i++) {
nsIFrame* grandChildList=nsnull; // to be used only when pseudoframes need to be created
nsIContent* childContent;
aContent->ChildAt(i, childContent);
@ -1000,8 +1001,28 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
break;
case NS_STYLE_DISPLAY_TABLE_COLUMN:
NS_NewTableColFrame(childContent, innerFrame, frame);
{
//XXX: Peter - please code review and remove this comment when all is well.
// When we're done here, "frame" will be the pseudo colgroup frame and will be dealt with normally after the swtich.
// The the column itself will have already been dealt with
nsIStyleContext* colStyleContext;
nsIStyleContext* colGroupStyleContext;
colGroupStyleContext = aPresContext->ResolvePseudoStyleContextFor (childContent,
nsHTMLAtoms::columnPseudo,
aStyleContext);
nsStyleDisplay *colGroupDisplay = (nsStyleDisplay *)colGroupStyleContext->GetMutableStyleData(eStyleStruct_Display);
colGroupDisplay->mDisplay = NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP;
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
childStyleContext = colGroupStyleContext; // the col group style context will get set to childStyleContext after the switch ends.
// need to resolve the style context for the column again to be sure it's a child of the colgroup style context
colStyleContext = aPresContext->ResolveStyleContextFor(childContent, colGroupStyleContext);
nsIFrame *colFrame;
NS_NewTableColFrame(childContent, frame, colFrame);
colFrame->SetInitialChildList(*aPresContext, nsnull, nsnull);
colFrame->SetStyleContext(aPresContext, colStyleContext);
grandChildList = colFrame;
break;
}
case NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP:
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
@ -1019,9 +1040,13 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
frame->SetStyleContext(aPresContext, childStyleContext);
// Process the children, and set the frame's initial child list
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
frame->SetInitialChildList(*aPresContext, nsnull, childChildList);
if (nsnull==grandChildList)
{
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
grandChildList = childChildList;
}
frame->SetInitialChildList(*aPresContext, nsnull, grandChildList);
// Link the frame into the child list
if (nsnull == lastChildFrame) {
@ -1329,6 +1354,8 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresContext,
case NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP:
// XXX We should check for being inside of a table. If there's a missing
// table then create an anonynmous table frame
// XXX: see ConstructTableFrame for a prototype of how this should be done,
// and propagate similar logic to other table elements
{
nsIFrame *parentFrame;
rv = GetAdjustedParentFrame(aParentFrame, aDisplay->mDisplay, parentFrame);

8
layout/html/table/src/nsTableColFrame.cpp
Просмотреть файл

@ -36,7 +36,6 @@ nsTableColFrame::nsTableColFrame(nsIContent* aContent, nsIFrame* aParentFrame)
: nsFrame(aContent, aParentFrame)
{
mColIndex = 0;
mRepeat = 1;
mMaxColWidth = 0;
mMinColWidth = 0;
mMaxEffectiveColWidth = 0;
@ -76,6 +75,13 @@ NS_METHOD nsTableColFrame::Reflow(nsIPresContext& aPresContext,
return NS_OK;
}
PRInt32 nsTableColFrame::GetSpan()
{
nsStyleTable* tableStyle;
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
return tableStyle->mSpan;
}
/* ----- global methods ----- */

14
layout/html/table/src/nsTableColFrame.h
Просмотреть файл

@ -29,7 +29,7 @@ public:
eWIDTH_SOURCE_CELL_WITH_SPAN=2 // a cell implicitly specified a width via colspan
};
void InitColFrame(PRInt32 aColIndex, PRInt32 aRepeat);
void InitColFrame(PRInt32 aColIndex);
/** instantiate a new instance of nsTableColFrame.
* @param aResult the new object is returned in this out-param
@ -56,7 +56,7 @@ public:
virtual int GetColumnIndex ();
/** return the number of the columns the col represents. always >= 0 */
virtual int GetRepeat ();
virtual int GetSpan ();
/** set the index of the column this content object represents. must be >= 0 */
virtual void SetColumnIndex (int aColIndex);
@ -96,8 +96,6 @@ protected:
/** the starting index of the column (starting at 0) that this col object represents */
PRInt32 mColIndex;
/** the number of columns that the attributes of this column extend to */
PRInt32 mRepeat;
nscoord mMaxColWidth;
nscoord mMinColWidth;
@ -112,21 +110,15 @@ protected:
};
inline void nsTableColFrame::InitColFrame(PRInt32 aColIndex, PRInt32 aRepeat)
inline void nsTableColFrame::InitColFrame(PRInt32 aColIndex)
{
NS_ASSERTION(0<=aColIndex, "bad col index param");
NS_ASSERTION(0<=aRepeat, "bad repeat param");
mColIndex = aColIndex;
mRepeat = aRepeat;
}
inline nsTableColFrame::GetColumnIndex()
{ return mColIndex; }
inline nsTableColFrame::GetRepeat()
{ return mRepeat; }
inline void nsTableColFrame::SetColumnIndex (int aColIndex)
{ mColIndex = aColIndex;}

63
layout/html/table/src/nsTableColGroupFrame.cpp
Просмотреть файл

@ -67,24 +67,20 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// Set the preliminary values for the column frame
nsIContent* kid;
kidFrame->GetContent(kid);
// should use style to get this value
PRInt32 repeat=1;
nsIHTMLTableColElement* colContent = nsnull;
rv = kid->QueryInterface(kIHTMLTableColElementIID,
(void**) &colContent); // colContent: ADDREF++
NS_RELEASE(kid);
if (rv==NS_OK)
{
colContent->GetSpanValue(&repeat);
NS_RELEASE(colContent);
}
PRInt32 colIndex = mStartColIndex + mColCount;
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex, repeat);
mColCount+= repeat;
tableFrame->AddColumnFrame((nsTableColFrame *)kidFrame);
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
PRInt32 repeat = ((nsTableColFrame *)(kidFrame))->GetSpan();
mColCount += repeat;
for (PRInt32 i=0; i<repeat; i++)
{
tableFrame->AddColumnFrame((nsTableColFrame *)kidFrame);
}
}
// colgroup's span attribute is how many columns the group represents
// in the absence of any COL children
// Note that this is the correct, though perhaps unexpected, behavior for the span attribute.
// The spec says that if there are any COL children, the colgroup's span is ignored.
if (0==mColCount)
{
nsIFrame *firstImplicitColFrame=nsnull;
@ -112,7 +108,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// Set nsColFrame-specific information
PRInt32 absColIndex = mStartColIndex + colIndex;
((nsTableColFrame *)(colFrame))->InitColFrame (absColIndex, 1);
((nsTableColFrame *)(colFrame))->InitColFrame (absColIndex);
((nsTableColFrame *)colFrame)->SetColumnIndex(absColIndex);
tableFrame->AddColumnFrame((nsTableColFrame *)colFrame);
@ -569,8 +565,39 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
}
colFrame->GetNextSibling(colFrame);
}
mStyleContext->RecalcAutomaticData(&aPresContext);
}
else
{
// propagate the colgroup width attribute down to the columns if they have no width of their own
nsStylePosition* position = (nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position);
if (eStyleUnit_Null!=position->mWidth.GetUnit())
{
// now for every column that doesn't have it's own width, set the width style
nsIFrame *colFrame=mFirstChild;
while (nsnull!=colFrame)
{
nsStyleDisplay * colDisplay=nsnull;
colFrame->GetStyleData(eStyleStruct_Display, ((nsStyleStruct *&)colDisplay));
if (NS_STYLE_DISPLAY_TABLE_COLUMN == colDisplay->mDisplay)
{
nsIStyleContextPtr colStyleContext;
nsStylePosition * colPosition=nsnull;
colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct *&)colPosition); // get a read-only version of the style context
//XXX: how do I know this is auto because it's defaulted, vs. set explicitly to "auto"?
if (eStyleUnit_Auto==colPosition->mWidth.GetUnit())
{
// notice how we defer getting a mutable style context until we're sure we really need one
colFrame->GetStyleContext(colStyleContext.AssignRef());
colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position);
colPosition->mWidth = position->mWidth;
colStyleContext->RecalcAutomaticData(&aPresContext);
}
}
colFrame->GetNextSibling(colFrame);
}
}
}
//mStyleContext->RecalcAutomaticData(&aPresContext);
}
return rv;
}
@ -592,7 +619,7 @@ int nsTableColGroupFrame::GetColumnCount ()
{
nsTableColFrame *col = (nsTableColFrame *)childFrame;
col->SetColumnIndex (mStartColIndex + mColCount);
mColCount += col->GetRepeat();
mColCount += col->GetSpan();
}
childFrame->GetNextSibling(childFrame);
}
@ -643,7 +670,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
if (NS_STYLE_DISPLAY_TABLE_COLUMN == childDisplay->mDisplay)
{
nsTableColFrame *col = (nsTableColFrame *)childFrame;
count += col->GetRepeat();
count += col->GetSpan();
if (aColIndex<=count)
result = col;
}

22
layout/html/table/src/nsTableFrame.cpp
Просмотреть файл

@ -649,6 +649,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
childFrame->GetStyleData(eStyleStruct_Display, ((nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == childDisplay->mDisplay)
{
((nsTableColGroupFrame*)childFrame)->SetStartColumnIndex(actualColumns);
PRInt32 numCols = ((nsTableColGroupFrame*)childFrame)->GetColumnCount();
actualColumns += numCols;
lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
@ -2965,14 +2966,18 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
childFrame->FirstChild(nsnull, (nsIFrame *&)colFrame);
while (nsnull!=colFrame)
{
nsTableColFrame *cachedColFrame = mCellMap->GetColumnFrame(colIndex);
if (nsnull==cachedColFrame)
PRInt32 repeat = colFrame->GetSpan();
for (PRInt32 i=0; i<repeat; i++)
{
if (gsDebug) printf("TIF BCB: adding column frame %p\n", colFrame);
mCellMap->AppendColumnFrame(colFrame);
nsTableColFrame *cachedColFrame = mCellMap->GetColumnFrame(colIndex+i);
if (nsnull==cachedColFrame)
{
if (gsDebug) printf("TIF BCB: adding column frame %p\n", colFrame);
mCellMap->AppendColumnFrame(colFrame);
}
colIndex++;
}
colFrame->GetNextSibling((nsIFrame *&)colFrame);
colIndex++;
}
}
else if (PR_TRUE==IsRowGroup(childDisplay->mDisplay))
@ -3029,7 +3034,12 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
{
const nsStylePosition* colPosition;
colFrame->GetStyleData(eStyleStruct_Position, ((nsStyleStruct *&)colPosition));
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colFrame->GetColumnIndex());
PRInt32 repeat = colFrame->GetSpan();
colIndex = colFrame->GetColumnIndex();
for (PRInt32 i=0; i<repeat; i++)
{
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i);
}
}
colFrame->GetNextSibling((nsIFrame *&)colFrame);
}

35
layout/style/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -962,6 +962,7 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
PRInt32 count;
aContent->ChildCount(count);
for (PRInt32 i = 0; i < count; i++) {
nsIFrame* grandChildList=nsnull; // to be used only when pseudoframes need to be created
nsIContent* childContent;
aContent->ChildAt(i, childContent);
@ -1000,8 +1001,28 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
break;
case NS_STYLE_DISPLAY_TABLE_COLUMN:
NS_NewTableColFrame(childContent, innerFrame, frame);
{
//XXX: Peter - please code review and remove this comment when all is well.
// When we're done here, "frame" will be the pseudo colgroup frame and will be dealt with normally after the swtich.
// The the column itself will have already been dealt with
nsIStyleContext* colStyleContext;
nsIStyleContext* colGroupStyleContext;
colGroupStyleContext = aPresContext->ResolvePseudoStyleContextFor (childContent,
nsHTMLAtoms::columnPseudo,
aStyleContext);
nsStyleDisplay *colGroupDisplay = (nsStyleDisplay *)colGroupStyleContext->GetMutableStyleData(eStyleStruct_Display);
colGroupDisplay->mDisplay = NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP;
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
childStyleContext = colGroupStyleContext; // the col group style context will get set to childStyleContext after the switch ends.
// need to resolve the style context for the column again to be sure it's a child of the colgroup style context
colStyleContext = aPresContext->ResolveStyleContextFor(childContent, colGroupStyleContext);
nsIFrame *colFrame;
NS_NewTableColFrame(childContent, frame, colFrame);
colFrame->SetInitialChildList(*aPresContext, nsnull, nsnull);
colFrame->SetStyleContext(aPresContext, colStyleContext);
grandChildList = colFrame;
break;
}
case NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP:
NS_NewTableColGroupFrame(childContent, innerFrame, frame);
@ -1019,9 +1040,13 @@ HTMLStyleSheetImpl::ConstructTableFrame(nsIPresContext* aPresContext,
frame->SetStyleContext(aPresContext, childStyleContext);
// Process the children, and set the frame's initial child list
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
frame->SetInitialChildList(*aPresContext, nsnull, childChildList);
if (nsnull==grandChildList)
{
nsIFrame* childChildList;
ProcessChildren(aPresContext, frame, childContent, childChildList);
grandChildList = childChildList;
}
frame->SetInitialChildList(*aPresContext, nsnull, grandChildList);
// Link the frame into the child list
if (nsnull == lastChildFrame) {
@ -1329,6 +1354,8 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresContext,
case NS_STYLE_DISPLAY_TABLE_FOOTER_GROUP:
// XXX We should check for being inside of a table. If there's a missing
// table then create an anonynmous table frame
// XXX: see ConstructTableFrame for a prototype of how this should be done,
// and propagate similar logic to other table elements
{
nsIFrame *parentFrame;
rv = GetAdjustedParentFrame(aParentFrame, aDisplay->mDisplay, parentFrame);

8
layout/tables/nsTableColFrame.cpp
Просмотреть файл

@ -36,7 +36,6 @@ nsTableColFrame::nsTableColFrame(nsIContent* aContent, nsIFrame* aParentFrame)
: nsFrame(aContent, aParentFrame)
{
mColIndex = 0;
mRepeat = 1;
mMaxColWidth = 0;
mMinColWidth = 0;
mMaxEffectiveColWidth = 0;
@ -76,6 +75,13 @@ NS_METHOD nsTableColFrame::Reflow(nsIPresContext& aPresContext,
return NS_OK;
}
PRInt32 nsTableColFrame::GetSpan()
{
nsStyleTable* tableStyle;
GetStyleData(eStyleStruct_Table, (nsStyleStruct *&)tableStyle);
return tableStyle->mSpan;
}
/* ----- global methods ----- */

14
layout/tables/nsTableColFrame.h
Просмотреть файл

@ -29,7 +29,7 @@ public:
eWIDTH_SOURCE_CELL_WITH_SPAN=2 // a cell implicitly specified a width via colspan
};
void InitColFrame(PRInt32 aColIndex, PRInt32 aRepeat);
void InitColFrame(PRInt32 aColIndex);
/** instantiate a new instance of nsTableColFrame.
* @param aResult the new object is returned in this out-param
@ -56,7 +56,7 @@ public:
virtual int GetColumnIndex ();
/** return the number of the columns the col represents. always >= 0 */
virtual int GetRepeat ();
virtual int GetSpan ();
/** set the index of the column this content object represents. must be >= 0 */
virtual void SetColumnIndex (int aColIndex);
@ -96,8 +96,6 @@ protected:
/** the starting index of the column (starting at 0) that this col object represents */
PRInt32 mColIndex;
/** the number of columns that the attributes of this column extend to */
PRInt32 mRepeat;
nscoord mMaxColWidth;
nscoord mMinColWidth;
@ -112,21 +110,15 @@ protected:
};
inline void nsTableColFrame::InitColFrame(PRInt32 aColIndex, PRInt32 aRepeat)
inline void nsTableColFrame::InitColFrame(PRInt32 aColIndex)
{
NS_ASSERTION(0<=aColIndex, "bad col index param");
NS_ASSERTION(0<=aRepeat, "bad repeat param");
mColIndex = aColIndex;
mRepeat = aRepeat;
}
inline nsTableColFrame::GetColumnIndex()
{ return mColIndex; }
inline nsTableColFrame::GetRepeat()
{ return mRepeat; }
inline void nsTableColFrame::SetColumnIndex (int aColIndex)
{ mColIndex = aColIndex;}

63
layout/tables/nsTableColGroupFrame.cpp
Просмотреть файл

@ -67,24 +67,20 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// Set the preliminary values for the column frame
nsIContent* kid;
kidFrame->GetContent(kid);
// should use style to get this value
PRInt32 repeat=1;
nsIHTMLTableColElement* colContent = nsnull;
rv = kid->QueryInterface(kIHTMLTableColElementIID,
(void**) &colContent); // colContent: ADDREF++
NS_RELEASE(kid);
if (rv==NS_OK)
{
colContent->GetSpanValue(&repeat);
NS_RELEASE(colContent);
}
PRInt32 colIndex = mStartColIndex + mColCount;
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex, repeat);
mColCount+= repeat;
tableFrame->AddColumnFrame((nsTableColFrame *)kidFrame);
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
PRInt32 repeat = ((nsTableColFrame *)(kidFrame))->GetSpan();
mColCount += repeat;
for (PRInt32 i=0; i<repeat; i++)
{
tableFrame->AddColumnFrame((nsTableColFrame *)kidFrame);
}
}
// colgroup's span attribute is how many columns the group represents
// in the absence of any COL children
// Note that this is the correct, though perhaps unexpected, behavior for the span attribute.
// The spec says that if there are any COL children, the colgroup's span is ignored.
if (0==mColCount)
{
nsIFrame *firstImplicitColFrame=nsnull;
@ -112,7 +108,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// Set nsColFrame-specific information
PRInt32 absColIndex = mStartColIndex + colIndex;
((nsTableColFrame *)(colFrame))->InitColFrame (absColIndex, 1);
((nsTableColFrame *)(colFrame))->InitColFrame (absColIndex);
((nsTableColFrame *)colFrame)->SetColumnIndex(absColIndex);
tableFrame->AddColumnFrame((nsTableColFrame *)colFrame);
@ -569,8 +565,39 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
}
colFrame->GetNextSibling(colFrame);
}
mStyleContext->RecalcAutomaticData(&aPresContext);
}
else
{
// propagate the colgroup width attribute down to the columns if they have no width of their own
nsStylePosition* position = (nsStylePosition*)mStyleContext->GetStyleData(eStyleStruct_Position);
if (eStyleUnit_Null!=position->mWidth.GetUnit())
{
// now for every column that doesn't have it's own width, set the width style
nsIFrame *colFrame=mFirstChild;
while (nsnull!=colFrame)
{
nsStyleDisplay * colDisplay=nsnull;
colFrame->GetStyleData(eStyleStruct_Display, ((nsStyleStruct *&)colDisplay));
if (NS_STYLE_DISPLAY_TABLE_COLUMN == colDisplay->mDisplay)
{
nsIStyleContextPtr colStyleContext;
nsStylePosition * colPosition=nsnull;
colFrame->GetStyleData(eStyleStruct_Position, (nsStyleStruct *&)colPosition); // get a read-only version of the style context
//XXX: how do I know this is auto because it's defaulted, vs. set explicitly to "auto"?
if (eStyleUnit_Auto==colPosition->mWidth.GetUnit())
{
// notice how we defer getting a mutable style context until we're sure we really need one
colFrame->GetStyleContext(colStyleContext.AssignRef());
colPosition = (nsStylePosition*)colStyleContext->GetMutableStyleData(eStyleStruct_Position);
colPosition->mWidth = position->mWidth;
colStyleContext->RecalcAutomaticData(&aPresContext);
}
}
colFrame->GetNextSibling(colFrame);
}
}
}
//mStyleContext->RecalcAutomaticData(&aPresContext);
}
return rv;
}
@ -592,7 +619,7 @@ int nsTableColGroupFrame::GetColumnCount ()
{
nsTableColFrame *col = (nsTableColFrame *)childFrame;
col->SetColumnIndex (mStartColIndex + mColCount);
mColCount += col->GetRepeat();
mColCount += col->GetSpan();
}
childFrame->GetNextSibling(childFrame);
}
@ -643,7 +670,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
if (NS_STYLE_DISPLAY_TABLE_COLUMN == childDisplay->mDisplay)
{
nsTableColFrame *col = (nsTableColFrame *)childFrame;
count += col->GetRepeat();
count += col->GetSpan();
if (aColIndex<=count)
result = col;
}

22
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -649,6 +649,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
childFrame->GetStyleData(eStyleStruct_Display, ((nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == childDisplay->mDisplay)
{
((nsTableColGroupFrame*)childFrame)->SetStartColumnIndex(actualColumns);
PRInt32 numCols = ((nsTableColGroupFrame*)childFrame)->GetColumnCount();
actualColumns += numCols;
lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
@ -2965,14 +2966,18 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
childFrame->FirstChild(nsnull, (nsIFrame *&)colFrame);
while (nsnull!=colFrame)
{
nsTableColFrame *cachedColFrame = mCellMap->GetColumnFrame(colIndex);
if (nsnull==cachedColFrame)
PRInt32 repeat = colFrame->GetSpan();
for (PRInt32 i=0; i<repeat; i++)
{
if (gsDebug) printf("TIF BCB: adding column frame %p\n", colFrame);
mCellMap->AppendColumnFrame(colFrame);
nsTableColFrame *cachedColFrame = mCellMap->GetColumnFrame(colIndex+i);
if (nsnull==cachedColFrame)
{
if (gsDebug) printf("TIF BCB: adding column frame %p\n", colFrame);
mCellMap->AppendColumnFrame(colFrame);
}
colIndex++;
}
colFrame->GetNextSibling((nsIFrame *&)colFrame);
colIndex++;
}
}
else if (PR_TRUE==IsRowGroup(childDisplay->mDisplay))
@ -3029,7 +3034,12 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
{
const nsStylePosition* colPosition;
colFrame->GetStyleData(eStyleStruct_Position, ((nsStyleStruct *&)colPosition));
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colFrame->GetColumnIndex());
PRInt32 repeat = colFrame->GetSpan();
colIndex = colFrame->GetColumnIndex();
for (PRInt32 i=0; i<repeat; i++)
{
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i);
}
}
colFrame->GetNextSibling((nsIFrame *&)colFrame);
}