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

Use shared is-html-paragraph method; fixed handling of floater widths for bug #2949

This commit is contained in:
kipp%netscape.com 1999-03-29 23:44:45 +00:00
Родитель b664c10973
Коммит c5e839c1a3
6 изменённых файлов: 42 добавлений и 126 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP

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

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP

28
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP

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

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP

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

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP

28
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -42,7 +42,6 @@
#include "nsIHTMLContent.h"
#include "prprf.h"
#include "nsLayoutAtoms.h"
#include "nsIDOMHTMLParagraphElement.h"
// XXX temporary for :first-letter support
#include "nsITextContent.h"
@ -964,7 +963,7 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
aMetrics.width = borderPadding.left + aReflowState.computedWidth +
borderPadding.right;
// XXX quote css1 section here
if (aMetrics.width < minWidth) {
if ((0 == aReflowState.computedWidth) && (aMetrics.width < minWidth)) {
aMetrics.width = minWidth;
}
@ -1364,11 +1363,7 @@ nsBlockFrame::RecoverStateFrom(nsBlockReflowState& aState,
const nsStyleSpacing* spacing;
frame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct*&)spacing);
// XXX use a reflow-state to do the necessary computations for blocks
#if XXX_fix_me
nsBlockReflowContext::ComputeMarginsFor(aState.mPresContext, frame,
spacing, aState.mReflowState,
childMargins);
#endif
// XXX_fix_me
}
aState.mPrevBottomMargin = 0;
@ -4805,21 +4800,12 @@ nsBlockFrame::Init(nsIPresContext& aPresContext,
SetFlags(blockFrame->mFlags);
}
// See if the content is an html paragraph to support some html
// compatability code.
if (nsnull != aContent) {
static NS_DEFINE_IID(kIDOMHTMLParagraphElementIID, NS_IDOMHTMLPARAGRAPHELEMENT_IID);
nsIDOMHTMLParagraphElement* p;
nsresult rv = aContent->QueryInterface(kIDOMHTMLParagraphElementIID,
(void**) &p);
if (NS_SUCCEEDED(rv) && p) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
NS_RELEASE(p);
}
nsresult rv = nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
if (nsBlockReflowContext::IsHTMLParagraph(this)) {
mState |= NS_BLOCK_IS_HTML_PARAGRAPH;
}
return nsBlockFrameSuper::Init(aPresContext, aContent, aParent,
aContext, aPrevInFlow);
return rv;
}
NS_IMETHODIMP