Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed it so relatively positioned block frames act as containing blocks

Browse Source 
for absolutely positioned child elements
This commit is contained in:
troy%netscape.com 1999-01-16 22:18:08 +00:00
parent 7103b076b4
commit 5febae06f6
9 changed files with 227 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
content/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -1875,6 +1875,31 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
// See if it's a relatively positioned block
} else if ((NS_STYLE_POSITION_RELATIVE == position->mPosition) &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay))) {
// Create an area frame. No space manager, though
NS_NewAreaFrame(aNewFrame, NS_AREA_NO_SPACE_MGR);
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
// Create a view
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, aNewFrame,
aStyleContext, PR_FALSE);
// Process the child content. Relatively positioned frames becomes a
// container for child frames that are positioned
nsAbsoluteItems absoluteItems(aNewFrame);
nsIFrame* childList = nsnull;
ProcessChildren(aPresContext, aContent, aNewFrame, absoluteItems, childList);
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
if (nsnull != absoluteItems.childList) {
aNewFrame->SetInitialChildList(*aPresContext, nsLayoutAtoms::absoluteList,
absoluteItems.childList);
}
} else {
PRBool processChildren = PR_FALSE; // whether we should process child content

120
layout/generic/nsAreaFrame.cpp
View File

@ -51,18 +51,31 @@ NS_NewAreaFrame(nsIFrame*& aResult, PRUint32 aFlags)
nsAreaFrame::nsAreaFrame()
{
mSpaceManager = new nsSpaceManager(this);
NS_ADDREF(mSpaceManager);
}
nsAreaFrame::~nsAreaFrame()
{
NS_RELEASE(mSpaceManager);
NS_IF_RELEASE(mSpaceManager);
}
/////////////////////////////////////////////////////////////////////////////
// nsIFrame
NS_IMETHODIMP
nsAreaFrame::Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext)
{
// Create a space manager if requested
if (0 == (mFlags & NS_AREA_NO_SPACE_MGR)) {
mSpaceManager = new nsSpaceManager(this);
NS_ADDREF(mSpaceManager);
}
return nsBlockFrame::Init(aPresContext, aContent, aParent, aContext);
}
NS_IMETHODIMP
nsAreaFrame::DeleteFrame(nsIPresContext& aPresContext)
{
@ -190,42 +203,44 @@ nsAreaFrame::Paint(nsIPresContext& aPresContext,
nsresult rv = nsBlockFrame::Paint(aPresContext, aRenderingContext,
aDirtyRect, aWhichLayer);
if ((eFramePaintLayer_Overlay == aWhichLayer) &&
nsIFrame::GetShowFrameBorders()) {
if ((eFramePaintLayer_Overlay == aWhichLayer) && nsIFrame::GetShowFrameBorders()) {
// Render the bands in the spacemanager
BandData band;
nsISpaceManager* sm = mSpaceManager;
nscoord y = 0;
while (y < mRect.height) {
sm->GetBandData(y, nsSize(mRect.width, mRect.height - y), band);
band.ComputeAvailSpaceRect();
// Render a box and a diagonal line through the band
aRenderingContext.SetColor(NS_RGB(0,255,0));
aRenderingContext.DrawRect(0, band.availSpace.y,
mRect.width, band.availSpace.height);
aRenderingContext.DrawLine(0, band.availSpace.y,
mRect.width, band.availSpace.YMost());
// Render boxes and opposite diagonal lines around the
// unavailable parts of the band.
PRInt32 i;
for (i = 0; i < band.count; i++) {
nsBandTrapezoid* trapezoid = &band.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
nsRect r;
trapezoid->GetRect(r);
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
aRenderingContext.SetColor(NS_RGB(0,255,128));
if (nsnull != sm) {
BandData band;
nscoord y = 0;
while (y < mRect.height) {
sm->GetBandData(y, nsSize(mRect.width, mRect.height - y), band);
band.ComputeAvailSpaceRect();
// Render a box and a diagonal line through the band
aRenderingContext.SetColor(NS_RGB(0,255,0));
aRenderingContext.DrawRect(0, band.availSpace.y,
mRect.width, band.availSpace.height);
aRenderingContext.DrawLine(0, band.availSpace.y,
mRect.width, band.availSpace.YMost());
// Render boxes and opposite diagonal lines around the
// unavailable parts of the band.
PRInt32 i;
for (i = 0; i < band.count; i++) {
nsBandTrapezoid* trapezoid = &band.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
nsRect r;
trapezoid->GetRect(r);
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
aRenderingContext.SetColor(NS_RGB(0,255,128));
}
else {
aRenderingContext.SetColor(NS_RGB(128,255,0));
}
aRenderingContext.DrawRect(r);
aRenderingContext.DrawLine(r.x, r.YMost(), r.XMost(), r.y);
}
else {
aRenderingContext.SetColor(NS_RGB(128,255,0));
}
aRenderingContext.DrawRect(r);
aRenderingContext.DrawLine(r.x, r.YMost(), r.XMost(), r.y);
}
y = band.availSpace.YMost();
}
y = band.availSpace.YMost();
}
}
@ -249,10 +264,13 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
// Make a copy of the reflow state so we can set the space manager
nsHTMLReflowState reflowState(aReflowState);
reflowState.spaceManager = mSpaceManager;
// Clear the spacemanager's regions.
mSpaceManager->ClearRegions();
if (nsnull != mSpaceManager) {
reflowState.spaceManager = mSpaceManager;
// Clear the spacemanager's regions.
mSpaceManager->ClearRegions();
}
// See if the reflow command is for an absolutely positioned frame
PRBool wasHandled = PR_FALSE;
@ -329,20 +347,22 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
// Compute our desired size. Take into account any floaters when computing the
// height
nscoord floaterYMost;
mSpaceManager->YMost(floaterYMost);
if (floaterYMost > 0) {
// What we need to check for is if the bottom most floater extends below
// the content area of the desired size
nsMargin borderPadding;
nscoord contentYMost;
nsHTMLReflowState::ComputeBorderPaddingFor(this, aReflowState.parentReflowState,
borderPadding);
contentYMost = aDesiredSize.height - borderPadding.bottom;
if (floaterYMost > contentYMost) {
aDesiredSize.height += floaterYMost - contentYMost;
if (nsnull != mSpaceManager) {
nscoord floaterYMost;
mSpaceManager->YMost(floaterYMost);
if (floaterYMost > 0) {
// What we need to check for is if the bottom most floater extends below
// the content area of the desired size
nsMargin borderPadding;
nscoord contentYMost;
nsHTMLReflowState::ComputeBorderPaddingFor(this, aReflowState.parentReflowState,
borderPadding);
contentYMost = aDesiredSize.height - borderPadding.bottom;
if (floaterYMost > contentYMost) {
aDesiredSize.height += floaterYMost - contentYMost;
}
}
}

5
layout/generic/nsAreaFrame.h
View File

@ -45,6 +45,11 @@ public:
friend nsresult NS_NewAreaFrame(nsIFrame*& aResult, PRUint32 aFlags);
// nsIFrame
NS_IMETHOD Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext);
NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext);
NS_IMETHOD SetInitialChildList(nsIPresContext& aPresContext,

1
layout/generic/nsHTMLParts.h
View File

@ -244,6 +244,7 @@ extern nsresult NS_NewBlockFrame(nsIFrame*& aNewFrame, PRUint32 aFlags);
#define NS_BLOCK_NO_AUTO_MARGINS 0x2
#define NS_BLOCK_MARGIN_ROOT 0x4
#define NS_BLOCK_DOCUMENT_ROOT 0x8
#define NS_AREA_NO_SPACE_MGR 0x10
extern nsresult NS_NewCommentFrame(nsIFrame*& aFrameResult);
extern nsresult NS_NewHRFrame(nsIFrame*& aNewFrame);

120
layout/html/base/src/nsAreaFrame.cpp
View File

@ -51,18 +51,31 @@ NS_NewAreaFrame(nsIFrame*& aResult, PRUint32 aFlags)
nsAreaFrame::nsAreaFrame()
{
mSpaceManager = new nsSpaceManager(this);
NS_ADDREF(mSpaceManager);
}
nsAreaFrame::~nsAreaFrame()
{
NS_RELEASE(mSpaceManager);
NS_IF_RELEASE(mSpaceManager);
}
/////////////////////////////////////////////////////////////////////////////
// nsIFrame
NS_IMETHODIMP
nsAreaFrame::Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext)
{
// Create a space manager if requested
if (0 == (mFlags & NS_AREA_NO_SPACE_MGR)) {
mSpaceManager = new nsSpaceManager(this);
NS_ADDREF(mSpaceManager);
}
return nsBlockFrame::Init(aPresContext, aContent, aParent, aContext);
}
NS_IMETHODIMP
nsAreaFrame::DeleteFrame(nsIPresContext& aPresContext)
{
@ -190,42 +203,44 @@ nsAreaFrame::Paint(nsIPresContext& aPresContext,
nsresult rv = nsBlockFrame::Paint(aPresContext, aRenderingContext,
aDirtyRect, aWhichLayer);
if ((eFramePaintLayer_Overlay == aWhichLayer) &&
nsIFrame::GetShowFrameBorders()) {
if ((eFramePaintLayer_Overlay == aWhichLayer) && nsIFrame::GetShowFrameBorders()) {
// Render the bands in the spacemanager
BandData band;
nsISpaceManager* sm = mSpaceManager;
nscoord y = 0;
while (y < mRect.height) {
sm->GetBandData(y, nsSize(mRect.width, mRect.height - y), band);
band.ComputeAvailSpaceRect();
// Render a box and a diagonal line through the band
aRenderingContext.SetColor(NS_RGB(0,255,0));
aRenderingContext.DrawRect(0, band.availSpace.y,
mRect.width, band.availSpace.height);
aRenderingContext.DrawLine(0, band.availSpace.y,
mRect.width, band.availSpace.YMost());
// Render boxes and opposite diagonal lines around the
// unavailable parts of the band.
PRInt32 i;
for (i = 0; i < band.count; i++) {
nsBandTrapezoid* trapezoid = &band.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
nsRect r;
trapezoid->GetRect(r);
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
aRenderingContext.SetColor(NS_RGB(0,255,128));
if (nsnull != sm) {
BandData band;
nscoord y = 0;
while (y < mRect.height) {
sm->GetBandData(y, nsSize(mRect.width, mRect.height - y), band);
band.ComputeAvailSpaceRect();
// Render a box and a diagonal line through the band
aRenderingContext.SetColor(NS_RGB(0,255,0));
aRenderingContext.DrawRect(0, band.availSpace.y,
mRect.width, band.availSpace.height);
aRenderingContext.DrawLine(0, band.availSpace.y,
mRect.width, band.availSpace.YMost());
// Render boxes and opposite diagonal lines around the
// unavailable parts of the band.
PRInt32 i;
for (i = 0; i < band.count; i++) {
nsBandTrapezoid* trapezoid = &band.data[i];
if (nsBandTrapezoid::Available != trapezoid->state) {
nsRect r;
trapezoid->GetRect(r);
if (nsBandTrapezoid::OccupiedMultiple == trapezoid->state) {
aRenderingContext.SetColor(NS_RGB(0,255,128));
}
else {
aRenderingContext.SetColor(NS_RGB(128,255,0));
}
aRenderingContext.DrawRect(r);
aRenderingContext.DrawLine(r.x, r.YMost(), r.XMost(), r.y);
}
else {
aRenderingContext.SetColor(NS_RGB(128,255,0));
}
aRenderingContext.DrawRect(r);
aRenderingContext.DrawLine(r.x, r.YMost(), r.XMost(), r.y);
}
y = band.availSpace.YMost();
}
y = band.availSpace.YMost();
}
}
@ -249,10 +264,13 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
// Make a copy of the reflow state so we can set the space manager
nsHTMLReflowState reflowState(aReflowState);
reflowState.spaceManager = mSpaceManager;
// Clear the spacemanager's regions.
mSpaceManager->ClearRegions();
if (nsnull != mSpaceManager) {
reflowState.spaceManager = mSpaceManager;
// Clear the spacemanager's regions.
mSpaceManager->ClearRegions();
}
// See if the reflow command is for an absolutely positioned frame
PRBool wasHandled = PR_FALSE;
@ -329,20 +347,22 @@ nsAreaFrame::Reflow(nsIPresContext& aPresContext,
// Compute our desired size. Take into account any floaters when computing the
// height
nscoord floaterYMost;
mSpaceManager->YMost(floaterYMost);
if (floaterYMost > 0) {
// What we need to check for is if the bottom most floater extends below
// the content area of the desired size
nsMargin borderPadding;
nscoord contentYMost;
nsHTMLReflowState::ComputeBorderPaddingFor(this, aReflowState.parentReflowState,
borderPadding);
contentYMost = aDesiredSize.height - borderPadding.bottom;
if (floaterYMost > contentYMost) {
aDesiredSize.height += floaterYMost - contentYMost;
if (nsnull != mSpaceManager) {
nscoord floaterYMost;
mSpaceManager->YMost(floaterYMost);
if (floaterYMost > 0) {
// What we need to check for is if the bottom most floater extends below
// the content area of the desired size
nsMargin borderPadding;
nscoord contentYMost;
nsHTMLReflowState::ComputeBorderPaddingFor(this, aReflowState.parentReflowState,
borderPadding);
contentYMost = aDesiredSize.height - borderPadding.bottom;
if (floaterYMost > contentYMost) {
aDesiredSize.height += floaterYMost - contentYMost;
}
}
}

5
layout/html/base/src/nsAreaFrame.h
View File

@ -45,6 +45,11 @@ public:
friend nsresult NS_NewAreaFrame(nsIFrame*& aResult, PRUint32 aFlags);
// nsIFrame
NS_IMETHOD Init(nsIPresContext& aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext);
NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext);
NS_IMETHOD SetInitialChildList(nsIPresContext& aPresContext,

1
layout/html/base/src/nsHTMLParts.h
View File

@ -244,6 +244,7 @@ extern nsresult NS_NewBlockFrame(nsIFrame*& aNewFrame, PRUint32 aFlags);
#define NS_BLOCK_NO_AUTO_MARGINS 0x2
#define NS_BLOCK_MARGIN_ROOT 0x4
#define NS_BLOCK_DOCUMENT_ROOT 0x8
#define NS_AREA_NO_SPACE_MGR 0x10
extern nsresult NS_NewCommentFrame(nsIFrame*& aFrameResult);
extern nsresult NS_NewHRFrame(nsIFrame*& aNewFrame);

25
layout/html/style/src/nsHTMLStyleSheet.cpp
View File

@ -1875,6 +1875,31 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
// See if it's a relatively positioned block
} else if ((NS_STYLE_POSITION_RELATIVE == position->mPosition) &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay))) {
// Create an area frame. No space manager, though
NS_NewAreaFrame(aNewFrame, NS_AREA_NO_SPACE_MGR);
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
// Create a view
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, aNewFrame,
aStyleContext, PR_FALSE);
// Process the child content. Relatively positioned frames becomes a
// container for child frames that are positioned
nsAbsoluteItems absoluteItems(aNewFrame);
nsIFrame* childList = nsnull;
ProcessChildren(aPresContext, aContent, aNewFrame, absoluteItems, childList);
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
if (nsnull != absoluteItems.childList) {
aNewFrame->SetInitialChildList(*aPresContext, nsLayoutAtoms::absoluteList,
absoluteItems.childList);
}
} else {
PRBool processChildren = PR_FALSE; // whether we should process child content

25
layout/style/nsHTMLStyleSheet.cpp
View File

@ -1875,6 +1875,31 @@ HTMLStyleSheetImpl::ConstructFrameByDisplayType(nsIPresContext* aPresConte
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
// See if it's a relatively positioned block
} else if ((NS_STYLE_POSITION_RELATIVE == position->mPosition) &&
((NS_STYLE_DISPLAY_BLOCK == aDisplay->mDisplay))) {
// Create an area frame. No space manager, though
NS_NewAreaFrame(aNewFrame, NS_AREA_NO_SPACE_MGR);
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
// Create a view
nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, aNewFrame,
aStyleContext, PR_FALSE);
// Process the child content. Relatively positioned frames becomes a
// container for child frames that are positioned
nsAbsoluteItems absoluteItems(aNewFrame);
nsIFrame* childList = nsnull;
ProcessChildren(aPresContext, aContent, aNewFrame, absoluteItems, childList);
// Set the frame's initial child list
aNewFrame->SetInitialChildList(*aPresContext, nsnull, childList);
if (nsnull != absoluteItems.childList) {
aNewFrame->SetInitialChildList(*aPresContext, nsLayoutAtoms::absoluteList,
absoluteItems.childList);
}
} else {
PRBool processChildren = PR_FALSE; // whether we should process child content