Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Collapse margins away for html paragraphs (bug #2589 and #2291); add is-html-paragraph method

Browse Source
This commit is contained in:
kipp%netscape.com 1999-03-29 23:45:36 +00:00
parent 60a2733104
commit ce880c5ca9
2 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
layout/generic/nsBlockReflowContext.cpp
View File

@ -25,6 +25,7 @@
#include "nsIStyleContext.h"
#include "nsHTMLContainerFrame.h"
#include "nsBlockFrame.h"
#include "nsIDOMHTMLParagraphElement.h"
#ifdef NS_DEBUG
#undef NOISY_MAX_ELEMENT_SIZE
@ -50,6 +51,26 @@ nsBlockReflowContext::nsBlockReflowContext(nsIPresContext& aPresContext,
#endif
}
PRBool
nsBlockReflowContext::IsHTMLParagraph(nsIFrame* aFrame)
{
PRBool result = PR_FALSE;
nsIContent* content;
nsresult rv = aFrame->GetContent(&content);
if (NS_SUCCEEDED(rv) && (nsnull != content)) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = content->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
result = PR_TRUE;
NS_RELEASE(p);
}
NS_RELEASE(content);
}
return result;
}
nscoord
nsBlockReflowContext::ComputeCollapsedTopMargin(nsHTMLReflowState& aRS)
{
@ -168,6 +189,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
}
#endif
}
mTopMargin = topMargin;
// Compute x/y coordinate where reflow will begin. Use the rules
// from 10.3.3 to determine what to apply. At this point in the
@ -376,11 +398,27 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
nscoord x = mX;
nscoord y = mY;
if (0 == mMetrics.height) {
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
y = mSpace.y;
if (IsHTMLParagraph(mFrame)) {
// Special "feature" for HTML compatability - empty paragraphs
// collapse into nothingness, including their margins.
*aBottomMarginResult = 0;
}
else {
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = collapsedBottomMargin;
}
// Empty blocks do not have anything special done to them and they
// always fit.
nsRect r(x, y, 0, 0);
mFrame->SetRect(r);
aInFlowBounds = r;
// Retain combined area information in case we contain a floater
// and nothing else.
aCombinedRect = mMetrics.mCombinedArea;

38
layout/html/base/src/nsBlockReflowContext.cpp
View File

@ -25,6 +25,7 @@
#include "nsIStyleContext.h"
#include "nsHTMLContainerFrame.h"
#include "nsBlockFrame.h"
#include "nsIDOMHTMLParagraphElement.h"
#ifdef NS_DEBUG
#undef NOISY_MAX_ELEMENT_SIZE
@ -50,6 +51,26 @@ nsBlockReflowContext::nsBlockReflowContext(nsIPresContext& aPresContext,
#endif
}
PRBool
nsBlockReflowContext::IsHTMLParagraph(nsIFrame* aFrame)
{
PRBool result = PR_FALSE;
nsIContent* content;
nsresult rv = aFrame->GetContent(&content);
if (NS_SUCCEEDED(rv) && (nsnull != content)) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = content->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
result = PR_TRUE;
NS_RELEASE(p);
}
NS_RELEASE(content);
}
return result;
}
nscoord
nsBlockReflowContext::ComputeCollapsedTopMargin(nsHTMLReflowState& aRS)
{
@ -168,6 +189,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
}
#endif
}
mTopMargin = topMargin;
// Compute x/y coordinate where reflow will begin. Use the rules
// from 10.3.3 to determine what to apply. At this point in the
@ -376,11 +398,27 @@ nsBlockReflowContext::PlaceBlock(PRBool aForceFit,
nscoord x = mX;
nscoord y = mY;
if (0 == mMetrics.height) {
// For empty blocks we revert the y coordinate back so that the
// top margin is no longer applied.
y = mSpace.y;
if (IsHTMLParagraph(mFrame)) {
// Special "feature" for HTML compatability - empty paragraphs
// collapse into nothingness, including their margins.
*aBottomMarginResult = 0;
}
else {
// Collapse the bottom margin with the top margin that was already
// applied.
nscoord newBottomMargin = MaxMargin(collapsedBottomMargin, mTopMargin);
*aBottomMarginResult = collapsedBottomMargin;
}
// Empty blocks do not have anything special done to them and they
// always fit.
nsRect r(x, y, 0, 0);
mFrame->SetRect(r);
aInFlowBounds = r;
// Retain combined area information in case we contain a floater
// and nothing else.
aCombinedRect = mMetrics.mCombinedArea;