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

Disabled (obsolete?) usage of MoveInSpaceManager

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47474 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-09-15 00:26:10 +00:00
parent b4aafbf17d
commit 52087d5ee4
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/layout/generic/nsBlockReflowContext.cpp
View File

@@ -377,17 +377,19 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
#endif
}
#if XXX
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
nsIHTMLReflow* htmlReflow;
nsresult rv = mFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
nsBlockFrame* bf;
nsresult rv = mFrame->QueryInterface(kBlockFrameCID, (void**)&bf);
if (NS_SUCCEEDED(rv)) {
// XXX This isn't good enough. What if the floater was placed
// downward, just below another floater?
nscoord dy = mSpace.y - mY;
htmlReflow->MoveInSpaceManager(mPresContext,
mOuterReflowState.mSpaceManager, 0, dy);
bf->MoveInSpaceManager(mPresContext, mOuterReflowState.mSpaceManager,
dy);
}
#endif
y = mSpace.y;
// Empty blocks do not have anything special done to them and they
@@ -523,6 +525,8 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
// Now place the frame
mFrame->SetRect(nsRect(x, y, mMetrics.width, mMetrics.height));
// XXX obsolete, i believe...
#if 0
// If the block frame ended up moving then we need to slide
// anything inside of it that impacts the space manager
// (otherwise the impacted space in the space manager will be
@@ -541,6 +545,7 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
dx, dy);
}
}
#endif
// Adjust the max-element-size in the metrics to take into
// account the margins around the block element. Note that we

13
mozilla/layout/html/base/src/nsBlockReflowContext.cpp
View File

@@ -377,17 +377,19 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
#endif
}
#if XXX
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
nsIHTMLReflow* htmlReflow;
nsresult rv = mFrame->QueryInterface(kIHTMLReflowIID, (void**)&htmlReflow);
nsBlockFrame* bf;
nsresult rv = mFrame->QueryInterface(kBlockFrameCID, (void**)&bf);
if (NS_SUCCEEDED(rv)) {
// XXX This isn't good enough. What if the floater was placed
// downward, just below another floater?
nscoord dy = mSpace.y - mY;
htmlReflow->MoveInSpaceManager(mPresContext,
mOuterReflowState.mSpaceManager, 0, dy);
bf->MoveInSpaceManager(mPresContext, mOuterReflowState.mSpaceManager,
dy);
}
#endif
y = mSpace.y;
// Empty blocks do not have anything special done to them and they
@@ -523,6 +525,8 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
// Now place the frame
mFrame->SetRect(nsRect(x, y, mMetrics.width, mMetrics.height));
// XXX obsolete, i believe...
#if 0
// If the block frame ended up moving then we need to slide
// anything inside of it that impacts the space manager
// (otherwise the impacted space in the space manager will be
@@ -541,6 +545,7 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
dx, dy);
}
}
#endif
// Adjust the max-element-size in the metrics to take into
// account the margins around the block element. Note that we