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

Removed references to mFirstContentOffset, mLastContentIsComplete, and mChildCount

This commit is contained in:
troy%netscape.com 1998-09-21 03:50:44 +00:00
Родитель e46c707ed3
Коммит e30e3bdf78
2 изменённых файлов: 0 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
layout/generic/nsHTMLFrame.cpp
Просмотреть файл

@ -96,7 +96,6 @@ RootFrame::Init(nsIPresContext& aPresContext, nsIFrame* aChildList)
{ {
// Construct the root content frame and set its style context // Construct the root content frame and set its style context
mFirstChild = new RootContentFrame(mContent, this); mFirstChild = new RootContentFrame(mContent, this);
mChildCount = 1;
nsIStyleContext* pseudoStyleContext = nsIStyleContext* pseudoStyleContext =
aPresContext.ResolvePseudoStyleContextFor(nsHTMLAtoms::rootContentPseudo, this); aPresContext.ResolvePseudoStyleContextFor(nsHTMLAtoms::rootContentPseudo, this);
mFirstChild->SetStyleContext(&aPresContext, pseudoStyleContext); mFirstChild->SetStyleContext(&aPresContext, pseudoStyleContext);
@ -155,8 +154,6 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
nsRect rect(0, 0, desiredSize.width, desiredSize.height); nsRect rect(0, 0, desiredSize.width, desiredSize.height);
mFirstChild->SetRect(rect); mFirstChild->SetRect(rect);
mFirstChild->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); mFirstChild->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED);
mLastContentOffset = ((RootContentFrame*)mFirstChild)->GetLastContentOffset();
} }
// Return the max size as our desired size // Return the max size as our desired size
@ -384,7 +381,6 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling"); NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
#endif #endif
kidFrame->SetNextSibling(continuingPage); kidFrame->SetNextSibling(continuingPage);
mChildCount++;
} }
// Get the next page // Get the next page
@ -448,8 +444,6 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
// We are always a pseudo-frame; make sure our content offset is // We are always a pseudo-frame; make sure our content offset is
// properly pushed upwards // properly pushed upwards
nsContainerFrame* parent = (nsContainerFrame*) mGeometricParent; nsContainerFrame* parent = (nsContainerFrame*) mGeometricParent;
parent->PropagateContentOffsets(this, mFirstContentOffset,
mLastContentOffset, mLastContentIsComplete);
#ifdef NS_DEBUG #ifdef NS_DEBUG
PostReflowCheck(aStatus); PostReflowCheck(aStatus);

6
layout/html/base/src/nsHTMLFrame.cpp
Просмотреть файл

@ -96,7 +96,6 @@ RootFrame::Init(nsIPresContext& aPresContext, nsIFrame* aChildList)
{ {
// Construct the root content frame and set its style context // Construct the root content frame and set its style context
mFirstChild = new RootContentFrame(mContent, this); mFirstChild = new RootContentFrame(mContent, this);
mChildCount = 1;
nsIStyleContext* pseudoStyleContext = nsIStyleContext* pseudoStyleContext =
aPresContext.ResolvePseudoStyleContextFor(nsHTMLAtoms::rootContentPseudo, this); aPresContext.ResolvePseudoStyleContextFor(nsHTMLAtoms::rootContentPseudo, this);
mFirstChild->SetStyleContext(&aPresContext, pseudoStyleContext); mFirstChild->SetStyleContext(&aPresContext, pseudoStyleContext);
@ -155,8 +154,6 @@ RootFrame::Reflow(nsIPresContext& aPresContext,
nsRect rect(0, 0, desiredSize.width, desiredSize.height); nsRect rect(0, 0, desiredSize.width, desiredSize.height);
mFirstChild->SetRect(rect); mFirstChild->SetRect(rect);
mFirstChild->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); mFirstChild->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED);
mLastContentOffset = ((RootContentFrame*)mFirstChild)->GetLastContentOffset();
} }
// Return the max size as our desired size // Return the max size as our desired size
@ -384,7 +381,6 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling"); NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
#endif #endif
kidFrame->SetNextSibling(continuingPage); kidFrame->SetNextSibling(continuingPage);
mChildCount++;
} }
// Get the next page // Get the next page
@ -448,8 +444,6 @@ RootContentFrame::Reflow(nsIPresContext& aPresContext,
// We are always a pseudo-frame; make sure our content offset is // We are always a pseudo-frame; make sure our content offset is
// properly pushed upwards // properly pushed upwards
nsContainerFrame* parent = (nsContainerFrame*) mGeometricParent; nsContainerFrame* parent = (nsContainerFrame*) mGeometricParent;
parent->PropagateContentOffsets(this, mFirstContentOffset,
mLastContentOffset, mLastContentIsComplete);
#ifdef NS_DEBUG #ifdef NS_DEBUG
PostReflowCheck(aStatus); PostReflowCheck(aStatus);