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

Moved space manager to block frame and changed it the space manager is

Browse Source 
temporary only during the reflow process
r=kipp@netscape.com


git-svn-id: svn://10.0.0.236/trunk@50036 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-10-06 22:05:23 +00:00
parent 7c76fd51f5
commit 032742ad4c
13 changed files with 126 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
mozilla/layout/generic/nsAreaFrame.cpp
View File

@@ -55,11 +55,6 @@ nsAreaFrame::nsAreaFrame()
{
}
nsAreaFrame::~nsAreaFrame()
{
NS_IF_RELEASE(mSpaceManager);
}
/////////////////////////////////////////////////////////////////////////////
// nsISupports
@@ -80,30 +75,6 @@ nsAreaFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
/////////////////////////////////////////////////////////////////////////////
// nsIFrame
NS_IMETHODIMP
nsAreaFrame::Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext,
nsIFrame* aPrevInFlow)
{
nsresult rv;
// Let the block frame do its initialization
rv = nsBlockFrame::Init(aPresContext, aContent, aParent, aContext, aPrevInFlow);
// Create a space manager if requested
if (0 == (mFlags & NS_AREA_NO_SPACE_MGR)) {
mSpaceManager = new nsSpaceManager(this);
if (!mSpaceManager) {
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ADDREF(mSpaceManager);
}
return rv;
}
NS_IMETHODIMP
nsAreaFrame::Destroy(nsIPresContext& aPresContext)
{
@@ -223,6 +194,7 @@ nsAreaFrame::Paint(nsIPresContext& aPresContext,
nsresult rv = nsBlockFrame::Paint(aPresContext, aRenderingContext,
aDirtyRect, aWhichLayer);
#if 0
if ((NS_FRAME_PAINT_LAYER_DEBUG == aWhichLayer) && GetShowFrameBorders()) {
// Render the bands in the spacemanager
nsISpaceManager* sm = mSpaceManager;
@@ -266,6 +238,9 @@ nsAreaFrame::Paint(nsIPresContext& aPresContext,
}
return rv;
#else
return NS_OK;
#endif
}
#endif
@@ -295,18 +270,6 @@ nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const
return rv;
}
NS_IMETHODIMP
nsAreaFrame::GetSpaceManager(nsISpaceManager** aSpaceManagerResult)
{
if (!aSpaceManagerResult) {
NS_WARNING("null ptr");
return NS_ERROR_NULL_POINTER;
}
*aSpaceManagerResult = mSpaceManager;
NS_IF_ADDREF(mSpaceManager);
return NS_OK;
}
static void
CalculateContainingBlock(const nsHTMLReflowState& aReflowState,
nscoord aFrameWidth,
@@ -378,16 +341,7 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
}
}
// If we have a space manager, then set it in the reflow state
if (nsnull != mSpaceManager) {
// Modify the existing reflow state
nsHTMLReflowState& reflowState = (nsHTMLReflowState&)aReflowState;
reflowState.mSpaceManager = mSpaceManager;
// Clear the spacemanager's regions
mSpaceManager->ClearRegions();
}
#if 0
#ifdef NOISY_SPACEMANAGER
if (eReflowReason_Incremental == aReflowState.reason) {
if (mSpaceManager) {
@@ -396,11 +350,13 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
mSpaceManager->List(stdout);
}
}
#endif
#endif
// Let the block frame do its reflow first
rv = nsBlockFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
#if 0
#ifdef NOISY_SPACEMANAGER
if (eReflowReason_Incremental == aReflowState.reason) {
if (mSpaceManager) {
@@ -409,6 +365,7 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
mSpaceManager->List(stdout);
}
}
#endif
#endif
if (mFlags & NS_AREA_WRAP_SIZE) {
@@ -547,14 +504,6 @@ nsAreaFrame::SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const
nsBlockFrame::SizeOf(aHandler, aResult);
*aResult += sizeof(*this) - sizeof(nsBlockFrame);
// Add in space taken up by the space manager
if (mSpaceManager) {
PRUint32 spaceManagerSize;
mSpaceManager->SizeOf(aHandler, &spaceManagerSize);
aHandler->AddSize(nsLayoutAtoms::spaceManager, spaceManagerSize);
}
return NS_OK;
}
#endif