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

just synching up some minor cleanup work

This commit is contained in:
buster%netscape.com 1998-09-30 18:11:48 +00:00
Родитель 0e8aa0e8f8
Коммит f56f1f80d1
6 изменённых файлов: 34 добавлений и 272 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -79,7 +79,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// in the absence of any COL children
if (0==mColCount)
{
nsIFrame *firstImplicitCol=nsnull;
nsIFrame *firstImplicitColFrame=nsnull;
nsIFrame *prevColFrame=nsnull;
nsAutoString colTag;
nsHTMLAtoms::col->ToString(colTag);
@ -109,15 +109,15 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
((nsTableFrame *)tableFrame)->AddColumnFrame((nsTableColFrame *)colFrame);
//hook into list of children
if (nsnull==firstImplicitCol)
firstImplicitCol = colFrame;
if (nsnull==firstImplicitColFrame)
firstImplicitColFrame = colFrame;
else
prevColFrame->SetNextSibling(colFrame);
prevColFrame = colFrame;
}
// hook new columns into col group child list
if (nsnull==mFirstChild)
mFirstChild = firstImplicitCol;
mFirstChild = firstImplicitColFrame;
else
{
nsIFrame *lastChild = mFirstChild;
@ -127,7 +127,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
lastChild = nextChild;
nextChild->GetNextSibling(nextChild);
}
lastChild->SetNextSibling(firstImplicitCol);
lastChild->SetNextSibling(firstImplicitColFrame);
}
}
SetStyleContextForFirstPass(&aPresContext);

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

@ -109,7 +109,7 @@ NS_IMETHODIMP nsTableOuterFrame::Init(nsIPresContext& aPresContext, nsIFrame* aC
mFirstChild = aChildList;
// Set our internal member data
mInnerTableFrame = (nsTableFrame*)mFirstChild;
mInnerTableFrame = mFirstChild;
if (2 == LengthOf(mFirstChild)) {
mFirstChild->GetNextSibling(mCaptionFrame);
}
@ -135,7 +135,7 @@ PRBool nsTableOuterFrame::NeedsReflow(const nsSize& aMaxSize)
{
PRBool result=PR_TRUE;
if (nsnull!=mInnerTableFrame)
result = mInnerTableFrame->NeedsReflow(aMaxSize);
result = ((nsTableFrame *)mInnerTableFrame)->NeedsReflow(aMaxSize);
return result;
}
@ -288,7 +288,6 @@ nsresult nsTableOuterFrame::IncrementalReflow(nsIPresContext* aPresContext,
// Reflow captions to the width of the inner table
kidReflowState.maxSize.width = aState.innerTableMaxSize.width;
}
mInnerTableFrame->SetReflowPass(nsTableFrame::kPASS_INCREMENTAL);
kidFrame->Reflow(*aPresContext, kidSize, kidReflowState, aStatus);
// Place the child frame after taking into account its margin
@ -302,6 +301,12 @@ nsresult nsTableOuterFrame::IncrementalReflow(nsIPresContext* aPresContext,
// XXX We're not correctly dealing with maxElementSize...
// XXX The type of kidFrame matters
// if it's this table's caption, we need to get a new maxElementSize and if the
// maxElementSize > tableWidth, reflow the table
// otherwise, it's destined for the inner table. Do the inner table's
// incremental reflow, and then reflow the caption if necessary.
// Adjust the frames that follow
return AdjustSiblingsAfterReflow(aPresContext, aState, kidFrame,
kidRect.YMost() - oldKidRect.YMost());
@ -414,15 +419,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
// Set up our kids. They're already present, on an overflow list,
// or there are none so we'll create them now
MoveOverflowToChildList();
// XXX CONSTRUCTION
#if 0
if (nsnull == mFirstChild) {
nsresult result = CreateChildFrames(&aPresContext);
if (NS_OK != result) {
return result;
}
}
#endif
// Lay out the caption and get its maximum element size
if (nsnull != mCaptionFrame) {
@ -446,7 +442,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
nscoord tableWidth = GetTableWidth(aReflowState);
// If the caption max element size is larger, then use it instead.
// Note: this implicitly forces the table width to be fixed...
if (mMinCaptionWidth > tableWidth) {
tableWidth = mMinCaptionWidth;
}
@ -602,74 +597,6 @@ void nsTableOuterFrame::PlaceChild( OuterTableReflowState& aState,
}
}
// XXX CONSTRUCTION
#if 0
nsresult nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext)
{
// Create the inner table frame
nsresult result = CreateInnerTableFrame(aPresContext, mInnerTableFrame);
if (NS_OK != result) {
return result;
}
// Add it to the list of child frames
mFirstChild = mInnerTableFrame;
// Now create the caption frame, prepending a top caption and appending a
// bottom caption
//
// We only allow a single caption. If there are more than one caption, then
// ignore all but the first
for (PRInt32 kidIndex = 0; /* nada */ ; kidIndex++)
{
nsIContentPtr caption;
mContent->ChildAt(kidIndex, caption.AssignRef());
if (PR_TRUE==caption.IsNull()) {
break;
}
// Resolve style so we can tell if the content should be displayed
// as a caption
nsIStyleContextPtr captionSC =
aPresContext->ResolveStyleContextFor(caption, this);
NS_ASSERTION(captionSC.IsNotNull(), "bad style context for caption.");
nsStyleDisplay *childDisplay = (nsStyleDisplay*)captionSC->GetStyleData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_TABLE_CAPTION == childDisplay->mDisplay)
{
// Create the caption frame.
nsIContentDelegate* kidDel = nsnull;
kidDel = caption->GetDelegate(aPresContext);
nsresult rv = kidDel->CreateFrame(aPresContext, caption, this, captionSC,
mCaptionFrame);
NS_RELEASE(kidDel);
if (NS_OK != rv) {
return rv;
}
// Determine if the caption is a top or bottom caption
const nsStyleText* captionTextStyle =
(const nsStyleText*)captionSC->GetStyleData(eStyleStruct_Text);
// Link child frame into the list of children
if ((eStyleUnit_Enumerated == captionTextStyle->mVerticalAlign.GetUnit()) &&
(NS_STYLE_VERTICAL_ALIGN_BOTTOM==captionTextStyle->mVerticalAlign.GetIntValue()))
{
// Bottom caption is added to the end of the child frame list
mInnerTableFrame->SetNextSibling(mCaptionFrame);
}
else
{
// Top caption is added to the beginning of child frame list
mCaptionFrame->SetNextSibling(mFirstChild);
mFirstChild = mCaptionFrame;
}
break;
}
}
return NS_OK;
}
#endif
NS_METHOD
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
@ -789,42 +716,6 @@ PRBool nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, n
}
/**
* Called by member function CreareChildFrames() to create the inner table
* frame. Resolves and sets the frame's style context
*/
nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
nsTableFrame*& aTableFrame)
{
// Do we have a prev-in-flow?
if (nsnull == mPrevInFlow) {
// No, create the inner table frame
aTableFrame = new nsTableFrame(mContent, this);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;
}
// Resolve style and set the style context. Have the inner table use our
// style context
aTableFrame->SetStyleContext(aPresContext, mStyleContext);
} else {
// Create a continuing column
nsTableOuterFrame* prevOuterTable = (nsTableOuterFrame*)mPrevInFlow;
nsIFrame* prevInnerTable = prevOuterTable->mInnerTableFrame;
nsIStyleContextPtr kidSC;
prevInnerTable->GetStyleContext(aPresContext, kidSC.AssignRef());
prevInnerTable->CreateContinuingFrame(*aPresContext, this, kidSC,
(nsIFrame*&)aTableFrame);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;
}
}
return NS_OK;
}
/* ----- global methods ----- */
nsresult
@ -896,4 +787,3 @@ NS_METHOD nsTableOuterFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFi
}
return NS_OK;
}

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

@ -21,7 +21,6 @@
#include "nscore.h"
#include "nsContainerFrame.h"
class nsTableFrame;
struct OuterTableReflowState;
/**
@ -87,9 +86,6 @@ protected:
*/
PRBool NeedsReflow(const nsSize& aMaxSize);
/** create all child frames for this table */
nsresult CreateChildFrames(nsIPresContext* aPresContext);
void PlaceChild(OuterTableReflowState& aState,
nsIFrame* aKidFrame,
const nsRect& aKidRect,
@ -126,13 +122,6 @@ protected:
*/
PRBool DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild);
/**
* Create the inner table frame (nsTableFrame). Handles initial
* creation as well as creation of continuing frames
*/
nsresult CreateInnerTableFrame(nsIPresContext* aPresContext,
nsTableFrame*& aTableFrame);
nsresult RecoverState(OuterTableReflowState& aState, nsIFrame* aKidFrame);
nsresult IncrementalReflow(nsIPresContext* aPresContext,
OuterTableReflowState& aState,
@ -146,8 +135,8 @@ protected:
private:
/** used to keep track of this frame's children */
nsTableFrame *mInnerTableFrame;
nsIFrame* mCaptionFrame;
nsIFrame *mInnerTableFrame;
nsIFrame *mCaptionFrame;
/** used to track caption max element size */
PRInt32 mMinCaptionWidth;
@ -162,4 +151,6 @@ inline nscoord nsTableOuterFrame::GetMinCaptionWidth()
{ return mMinCaptionWidth; }
#endif

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

@ -79,7 +79,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
// in the absence of any COL children
if (0==mColCount)
{
nsIFrame *firstImplicitCol=nsnull;
nsIFrame *firstImplicitColFrame=nsnull;
nsIFrame *prevColFrame=nsnull;
nsAutoString colTag;
nsHTMLAtoms::col->ToString(colTag);
@ -109,15 +109,15 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
((nsTableFrame *)tableFrame)->AddColumnFrame((nsTableColFrame *)colFrame);
//hook into list of children
if (nsnull==firstImplicitCol)
firstImplicitCol = colFrame;
if (nsnull==firstImplicitColFrame)
firstImplicitColFrame = colFrame;
else
prevColFrame->SetNextSibling(colFrame);
prevColFrame = colFrame;
}
// hook new columns into col group child list
if (nsnull==mFirstChild)
mFirstChild = firstImplicitCol;
mFirstChild = firstImplicitColFrame;
else
{
nsIFrame *lastChild = mFirstChild;
@ -127,7 +127,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
lastChild = nextChild;
nextChild->GetNextSibling(nextChild);
}
lastChild->SetNextSibling(firstImplicitCol);
lastChild->SetNextSibling(firstImplicitColFrame);
}
}
SetStyleContextForFirstPass(&aPresContext);

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

@ -109,7 +109,7 @@ NS_IMETHODIMP nsTableOuterFrame::Init(nsIPresContext& aPresContext, nsIFrame* aC
mFirstChild = aChildList;
// Set our internal member data
mInnerTableFrame = (nsTableFrame*)mFirstChild;
mInnerTableFrame = mFirstChild;
if (2 == LengthOf(mFirstChild)) {
mFirstChild->GetNextSibling(mCaptionFrame);
}
@ -135,7 +135,7 @@ PRBool nsTableOuterFrame::NeedsReflow(const nsSize& aMaxSize)
{
PRBool result=PR_TRUE;
if (nsnull!=mInnerTableFrame)
result = mInnerTableFrame->NeedsReflow(aMaxSize);
result = ((nsTableFrame *)mInnerTableFrame)->NeedsReflow(aMaxSize);
return result;
}
@ -288,7 +288,6 @@ nsresult nsTableOuterFrame::IncrementalReflow(nsIPresContext* aPresContext,
// Reflow captions to the width of the inner table
kidReflowState.maxSize.width = aState.innerTableMaxSize.width;
}
mInnerTableFrame->SetReflowPass(nsTableFrame::kPASS_INCREMENTAL);
kidFrame->Reflow(*aPresContext, kidSize, kidReflowState, aStatus);
// Place the child frame after taking into account its margin
@ -302,6 +301,12 @@ nsresult nsTableOuterFrame::IncrementalReflow(nsIPresContext* aPresContext,
// XXX We're not correctly dealing with maxElementSize...
// XXX The type of kidFrame matters
// if it's this table's caption, we need to get a new maxElementSize and if the
// maxElementSize > tableWidth, reflow the table
// otherwise, it's destined for the inner table. Do the inner table's
// incremental reflow, and then reflow the caption if necessary.
// Adjust the frames that follow
return AdjustSiblingsAfterReflow(aPresContext, aState, kidFrame,
kidRect.YMost() - oldKidRect.YMost());
@ -414,15 +419,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
// Set up our kids. They're already present, on an overflow list,
// or there are none so we'll create them now
MoveOverflowToChildList();
// XXX CONSTRUCTION
#if 0
if (nsnull == mFirstChild) {
nsresult result = CreateChildFrames(&aPresContext);
if (NS_OK != result) {
return result;
}
}
#endif
// Lay out the caption and get its maximum element size
if (nsnull != mCaptionFrame) {
@ -446,7 +442,6 @@ NS_METHOD nsTableOuterFrame::Reflow(nsIPresContext& aPresContext,
nscoord tableWidth = GetTableWidth(aReflowState);
// If the caption max element size is larger, then use it instead.
// Note: this implicitly forces the table width to be fixed...
if (mMinCaptionWidth > tableWidth) {
tableWidth = mMinCaptionWidth;
}
@ -602,74 +597,6 @@ void nsTableOuterFrame::PlaceChild( OuterTableReflowState& aState,
}
}
// XXX CONSTRUCTION
#if 0
nsresult nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext)
{
// Create the inner table frame
nsresult result = CreateInnerTableFrame(aPresContext, mInnerTableFrame);
if (NS_OK != result) {
return result;
}
// Add it to the list of child frames
mFirstChild = mInnerTableFrame;
// Now create the caption frame, prepending a top caption and appending a
// bottom caption
//
// We only allow a single caption. If there are more than one caption, then
// ignore all but the first
for (PRInt32 kidIndex = 0; /* nada */ ; kidIndex++)
{
nsIContentPtr caption;
mContent->ChildAt(kidIndex, caption.AssignRef());
if (PR_TRUE==caption.IsNull()) {
break;
}
// Resolve style so we can tell if the content should be displayed
// as a caption
nsIStyleContextPtr captionSC =
aPresContext->ResolveStyleContextFor(caption, this);
NS_ASSERTION(captionSC.IsNotNull(), "bad style context for caption.");
nsStyleDisplay *childDisplay = (nsStyleDisplay*)captionSC->GetStyleData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_TABLE_CAPTION == childDisplay->mDisplay)
{
// Create the caption frame.
nsIContentDelegate* kidDel = nsnull;
kidDel = caption->GetDelegate(aPresContext);
nsresult rv = kidDel->CreateFrame(aPresContext, caption, this, captionSC,
mCaptionFrame);
NS_RELEASE(kidDel);
if (NS_OK != rv) {
return rv;
}
// Determine if the caption is a top or bottom caption
const nsStyleText* captionTextStyle =
(const nsStyleText*)captionSC->GetStyleData(eStyleStruct_Text);
// Link child frame into the list of children
if ((eStyleUnit_Enumerated == captionTextStyle->mVerticalAlign.GetUnit()) &&
(NS_STYLE_VERTICAL_ALIGN_BOTTOM==captionTextStyle->mVerticalAlign.GetIntValue()))
{
// Bottom caption is added to the end of the child frame list
mInnerTableFrame->SetNextSibling(mCaptionFrame);
}
else
{
// Top caption is added to the beginning of child frame list
mCaptionFrame->SetNextSibling(mFirstChild);
mFirstChild = mCaptionFrame;
}
break;
}
}
return NS_OK;
}
#endif
NS_METHOD
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
@ -789,42 +716,6 @@ PRBool nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, n
}
/**
* Called by member function CreareChildFrames() to create the inner table
* frame. Resolves and sets the frame's style context
*/
nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
nsTableFrame*& aTableFrame)
{
// Do we have a prev-in-flow?
if (nsnull == mPrevInFlow) {
// No, create the inner table frame
aTableFrame = new nsTableFrame(mContent, this);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;
}
// Resolve style and set the style context. Have the inner table use our
// style context
aTableFrame->SetStyleContext(aPresContext, mStyleContext);
} else {
// Create a continuing column
nsTableOuterFrame* prevOuterTable = (nsTableOuterFrame*)mPrevInFlow;
nsIFrame* prevInnerTable = prevOuterTable->mInnerTableFrame;
nsIStyleContextPtr kidSC;
prevInnerTable->GetStyleContext(aPresContext, kidSC.AssignRef());
prevInnerTable->CreateContinuingFrame(*aPresContext, this, kidSC,
(nsIFrame*&)aTableFrame);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;
}
}
return NS_OK;
}
/* ----- global methods ----- */
nsresult
@ -896,4 +787,3 @@ NS_METHOD nsTableOuterFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFi
}
return NS_OK;
}

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

@ -21,7 +21,6 @@
#include "nscore.h"
#include "nsContainerFrame.h"
class nsTableFrame;
struct OuterTableReflowState;
/**
@ -87,9 +86,6 @@ protected:
*/
PRBool NeedsReflow(const nsSize& aMaxSize);
/** create all child frames for this table */
nsresult CreateChildFrames(nsIPresContext* aPresContext);
void PlaceChild(OuterTableReflowState& aState,
nsIFrame* aKidFrame,
const nsRect& aKidRect,
@ -126,13 +122,6 @@ protected:
*/
PRBool DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild);
/**
* Create the inner table frame (nsTableFrame). Handles initial
* creation as well as creation of continuing frames
*/
nsresult CreateInnerTableFrame(nsIPresContext* aPresContext,
nsTableFrame*& aTableFrame);
nsresult RecoverState(OuterTableReflowState& aState, nsIFrame* aKidFrame);
nsresult IncrementalReflow(nsIPresContext* aPresContext,
OuterTableReflowState& aState,
@ -146,8 +135,8 @@ protected:
private:
/** used to keep track of this frame's children */
nsTableFrame *mInnerTableFrame;
nsIFrame* mCaptionFrame;
nsIFrame *mInnerTableFrame;
nsIFrame *mCaptionFrame;
/** used to track caption max element size */
PRInt32 mMinCaptionWidth;
@ -162,4 +151,6 @@ inline nscoord nsTableOuterFrame::GetMinCaptionWidth()
{ return mMinCaptionWidth; }
#endif