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

Spanked away SizeOf methods and nsIListFilter

This commit is contained in:
kipp%netscape.com 1999-01-16 00:00:50 +00:00
Родитель 1815acd0fb
Коммит 7f96144059
108 изменённых файлов: 637 добавлений и 2427 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
content/base/public/nsIContent.h
Просмотреть файл

@ -29,7 +29,6 @@ class nsIAtom;
class nsIContentDelegate;
class nsIDocument;
class nsIPresContext;
class nsISizeOfHandler;
class nsString;
class nsString;
class nsVoidArray;
@ -222,12 +221,6 @@ public:
NS_IMETHOD RangeRemove(nsIDOMRange& aRange) = 0;
NS_IMETHOD GetRangeList(nsVoidArray*& aResult) const = 0;
/**
* Add this object's size information to the sizeof handler and
* any objects that it can reach.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
/**
* Handle a DOM event for this piece of content.
*/

12
content/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -682,15 +682,3 @@ nsGenericDOMDataNode::GetRangeList(nsVoidArray*& aResult) const
aResult = mRangeList;
return NS_OK;
}
//----------------------------------------------------------------------
// XXX not really implemented (yet)
nsresult
nsGenericDOMDataNode::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}

4
content/base/src/nsGenericDOMDataNode.h
Просмотреть файл

@ -175,7 +175,6 @@ struct nsGenericDOMDataNode {
nsresult GetRangeList(nsVoidArray*& aResult) const;
// Implementation for nsIContent
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult BeginConvertToXIF(nsXIFConverter& aConverter) const;
nsresult ConvertContentToXIF(nsXIFConverter& aConverter) const;
nsresult FinishConvertToXIF(nsXIFConverter& aConverter) const;
@ -442,9 +441,6 @@ struct nsGenericDOMDataNode {
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const { \
return _g.SizeOf(aHandler); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \

7
content/base/src/nsGenericElement.cpp
Просмотреть файл

@ -1753,13 +1753,6 @@ nsGenericContainerElement::List(FILE* out, PRInt32 aIndent) const
return NS_OK;
}
nsresult
nsGenericContainerElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericContainerElement::CanContainChildren(PRBool& aResult) const
{

4
content/base/src/nsGenericElement.h
Просмотреть файл

@ -247,7 +247,6 @@ public:
nsIAtom*& aName) const;
nsresult GetAttributeCount(PRInt32& aResult) const;
nsresult List(FILE* out, PRInt32 aIndent) const;
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const;
nsresult ChildCount(PRInt32& aResult) const;
nsresult ChildAt(PRInt32 aIndex, nsIContent*& aResult) const;
@ -479,9 +478,6 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const { \
return _g.SizeOf(aHandler); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \

11
content/base/src/nsHTMLValue.cpp
Просмотреть файл

@ -305,14 +305,3 @@ void nsHTMLValue::ToString(nsString& aBuffer) const
aBuffer.Truncate();
AppendToString(aBuffer);
}
void
nsHTMLValue::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (eHTMLUnit_String == mUnit) {
if (!aHandler->HaveSeen(mValue.mString)) {
mValue.mString->SizeOf(aHandler);
}
}
}

2
content/base/src/nsHTMLValue.h
Просмотреть файл

@ -22,7 +22,6 @@
#include "nsColor.h"
#include "nsString.h"
#include "nsISupports.h"
class nsISizeOfHandler;
enum nsHTMLUnit {
eHTMLUnit_Null = 0, // (n/a) null unit, value is not specified
@ -73,7 +72,6 @@ public:
void AppendToString(nsString& aBuffer) const;
void ToString(nsString& aBuffer) const;
void SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsHTMLUnit mUnit;

15
content/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -1916,14 +1916,6 @@ nsGenericHTMLLeafElement::GetChildNodes(nsIDOMNodeList** aChildNodes)
return slots->mChildNodes->QueryInterface(kIDOMNodeListIID, (void **)aChildNodes);
}
// XXX not really implemented (yet)
nsresult
nsGenericHTMLLeafElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericHTMLLeafElement::BeginConvertToXIF(nsXIFConverter& aConverter) const
{
@ -2383,13 +2375,6 @@ nsGenericHTMLContainerElement::Compact()
return NS_OK;
}
nsresult
nsGenericHTMLContainerElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericHTMLContainerElement::CanContainChildren(PRBool& aResult) const
{

2
content/html/content/src/nsGenericHTMLElement.h
Просмотреть файл

@ -287,7 +287,6 @@ public:
nsresult Compact() {
return NS_OK;
}
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const {
aResult = PR_FALSE;
return NS_OK;
@ -347,7 +346,6 @@ public:
nsresult ConvertContentToXIF(nsXIFConverter& aConverter) const;
nsresult FinishConvertToXIF(nsXIFConverter& aConverter) const;
nsresult Compact();
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const;
nsresult ChildCount(PRInt32& aResult) const;
nsresult ChildAt(PRInt32 aIndex, nsIContent*& aResult) const;

2
content/html/content/src/nsHTMLTableRowElement.cpp
Просмотреть файл

@ -121,7 +121,7 @@ void TempList(nsIDOMHTMLTableElement* aTable) {
nsIFrame* rootFrame;
shell->GetRootFrame(rootFrame);
if (nsnull != rootFrame) {
rootFrame->List(stdout, 0, nsnull);
rootFrame->List(stdout, 0);
}
}
NS_RELEASE(shell);

34
content/html/style/src/nsHTMLAttributes.cpp
Просмотреть файл

@ -26,7 +26,6 @@
#include "nsIStyleContext.h"
#include "nsHTMLAtoms.h"
#include "nsIHTMLContent.h"
#include "nsISizeOfHandler.h"
#include "nsVoidArray.h"
static NS_DEFINE_IID(kIHTMLAttributesIID, NS_IHTML_ATTRIBUTES_IID);
@ -71,8 +70,6 @@ struct HTMLAttribute {
NS_IF_RELEASE(mAttribute);
}
void SizeOf(nsISizeOfHandler* aHandler) const;
HTMLAttribute& operator=(const HTMLAttribute& aCopy)
{
NS_IF_RELEASE(mAttribute);
@ -151,20 +148,6 @@ struct HTMLAttribute {
HTMLAttribute* mNext;
};
void
HTMLAttribute::SizeOf(nsISizeOfHandler* aHandler) const
{
if (!aHandler->HaveSeen(mAttribute)) {
mAttribute->SizeOf(aHandler);
}
aHandler->Add(sizeof(*this));
aHandler->Add((size_t) (- ((PRInt32) sizeof(mValue)) ) );
mValue.SizeOf(aHandler);
if (!aHandler->HaveSeen(mNext)) {
mNext->SizeOf(aHandler);
}
}
// ----------------
struct nsClassList {
@ -245,11 +228,6 @@ public:
NS_IMETHOD GetStrength(PRInt32& aStrength) const;
NS_IMETHOD MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext);
/**
* Add this object's size information to the sizeof handler.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
private:
@ -859,18 +837,6 @@ HTMLAttributesImpl::GetStrength(PRInt32& aStrength) const
return NS_OK;
}
NS_IMETHODIMP
HTMLAttributesImpl::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
// XXX mID
// XXX mClass
if (!aHandler->HaveSeen(mFirst.mNext)) {
mFirst.mNext->SizeOf(aHandler);
}
return NS_OK;
}
NS_IMETHODIMP
HTMLAttributesImpl::List(FILE* out, PRInt32 aIndent) const
{

11
content/html/style/src/nsHTMLValue.cpp
Просмотреть файл

@ -305,14 +305,3 @@ void nsHTMLValue::ToString(nsString& aBuffer) const
aBuffer.Truncate();
AppendToString(aBuffer);
}
void
nsHTMLValue::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (eHTMLUnit_String == mUnit) {
if (!aHandler->HaveSeen(mValue.mString)) {
mValue.mString->SizeOf(aHandler);
}
}
}

2
content/html/style/src/nsHTMLValue.h
Просмотреть файл

@ -22,7 +22,6 @@
#include "nsColor.h"
#include "nsString.h"
#include "nsISupports.h"
class nsISizeOfHandler;
enum nsHTMLUnit {
eHTMLUnit_Null = 0, // (n/a) null unit, value is not specified
@ -73,7 +72,6 @@ public:
void AppendToString(nsString& aBuffer) const;
void ToString(nsString& aBuffer) const;
void SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsHTMLUnit mUnit;

6
content/html/style/src/nsIHTMLAttributes.h
Просмотреть файл

@ -23,7 +23,6 @@
#include "nsHTMLValue.h"
#include "nsIHTMLContent.h"
class nsIAtom;
class nsISizeOfHandler;
class nsISupportsArray;
class nsIHTMLStyleSheet;
@ -67,11 +66,6 @@ public:
NS_IMETHOD SetMappingFunction(nsMapAttributesFunc aMapFunc) = 0;
NS_IMETHOD SetStyleSheet(nsIHTMLStyleSheet* aSheet) = 0;
/**
* Add this object's size information to the sizeof handler.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0) const = 0;
};

2
content/shared/public/nsHTMLValue.h
Просмотреть файл

@ -22,7 +22,6 @@
#include "nsColor.h"
#include "nsString.h"
#include "nsISupports.h"
class nsISizeOfHandler;
enum nsHTMLUnit {
eHTMLUnit_Null = 0, // (n/a) null unit, value is not specified
@ -73,7 +72,6 @@ public:
void AppendToString(nsString& aBuffer) const;
void ToString(nsString& aBuffer) const;
void SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsHTMLUnit mUnit;

11
content/shared/src/nsHTMLValue.cpp
Просмотреть файл

@ -305,14 +305,3 @@ void nsHTMLValue::ToString(nsString& aBuffer) const
aBuffer.Truncate();
AppendToString(aBuffer);
}
void
nsHTMLValue::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (eHTMLUnit_String == mUnit) {
if (!aHandler->HaveSeen(mValue.mString)) {
mValue.mString->SizeOf(aHandler);
}
}
}

3
content/xml/content/src/nsXMLElement.h
Просмотреть файл

@ -140,9 +140,6 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const {
return mInner.FinishConvertToXIF(aConverter);
}
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const {
return mInner.SizeOf(aHandler);
}
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,

4
layout/base/nsPresShell.cpp
Просмотреть файл

@ -1421,8 +1421,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
printf(" %s\n", aMsg);
if (gVerifyReflowAll) {
k1->List(stdout, 1, nsnull);
k2->List(stdout, 1, nsnull);
k1->List(stdout, 1);
k2->List(stdout, 1);
}
}

7
layout/base/public/nsIContent.h
Просмотреть файл

@ -29,7 +29,6 @@ class nsIAtom;
class nsIContentDelegate;
class nsIDocument;
class nsIPresContext;
class nsISizeOfHandler;
class nsString;
class nsString;
class nsVoidArray;
@ -222,12 +221,6 @@ public:
NS_IMETHOD RangeRemove(nsIDOMRange& aRange) = 0;
NS_IMETHOD GetRangeList(nsVoidArray*& aResult) const = 0;
/**
* Add this object's size information to the sizeof handler and
* any objects that it can reach.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
/**
* Handle a DOM event for this piece of content.
*/

22
layout/base/public/nsIFrame.h
Просмотреть файл

@ -31,13 +31,11 @@ class nsIFrame;
class nsIPresContext;
class nsIPresShell;
class nsIRenderingContext;
class nsISizeOfHandler;
class nsISpaceManager;
class nsIStyleContext;
class nsIView;
class nsIWidget;
class nsIReflowCommand;
class nsIListFilter;
class nsAutoString;
class nsString;
@ -264,13 +262,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame) = 0;
/**
* Add this object's size information to the sizeof handler. Note that
* this does <b>not</b> add in the size of content, style, or view's
* (those are sized seperately).
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
/**
* Deletes this frame and each of its child frames (recursively calls
* DeleteFrame() for each child)
@ -517,9 +508,7 @@ public:
NS_IMETHOD Scrolled(nsIView *aView) = 0;
// Debugging
NS_IMETHOD List(FILE* out,
PRInt32 aIndent,
nsIListFilter *aFilter) const = 0;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const = 0;
/**
* Get a printable from of the name of the frame type.
@ -542,8 +531,6 @@ public:
NS_IMETHOD GetSelected(PRBool *aSelected, PRInt32 *aBeginOffset, PRInt32 *aEndOffset, PRInt32 *aBeginContentOffset) = 0;
static NS_LAYOUT nsIListFilter * GetFilter(nsString *aFilterName);
/**
* See if tree verification is enabled. To enable tree verification add
* "frameverifytree:1" to your NSPR_LOG_MODULES environment variable
@ -578,11 +565,4 @@ private:
NS_IMETHOD_(nsrefcnt) Release(void) = 0;
};
/* ----- nsIListFilter definition ----- */
class nsIListFilter
{
public:
virtual PRBool OutputTag(nsAutoString *aTag) const = 0;
};
#endif /* nsIFrame_h___ */

3
layout/base/public/nsIFrameImageLoader.h
Просмотреть файл

@ -25,7 +25,6 @@ class nsIFrame;
class nsIImage;
class nsIImageGroup;
class nsIPresContext;
class nsISizeOfHandler;
class nsString;
struct nsSize;
@ -70,8 +69,6 @@ public:
NS_IMETHOD GetSize(nsSize& aResult) const = 0;
NS_IMETHOD GetImageLoadStatus(PRIntn& aLoadStatus) const = 0;
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
};
// Image load status bit values

6
layout/base/src/nsDocumentFragment.h
Просмотреть файл

@ -21,7 +21,6 @@
#include "nsIDOMDocumentFragment.h"
#include "nsIScriptObjectOwner.h"
#include "nsGenericElement.h"
#include "nsISizeOfHandler.h"
#include "nsINameSpaceManager.h"
class nsIDocument;
@ -172,11 +171,6 @@ public:
{ return NS_OK; }
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const
{ return NS_OK; }
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext,
nsEvent* aEvent,
nsIDOMEvent** aDOMEvent,

9
layout/base/src/nsFrameImageLoader.cpp
Просмотреть файл

@ -391,12 +391,3 @@ nsFrameImageLoader::GetImageLoadStatus(PRIntn& aLoadStatus) const
aLoadStatus = mImageLoadStatus;
return NS_OK;
}
NS_IMETHODIMP
nsFrameImageLoader::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
// XXX mImage
// XXX mImageRequest
return NS_OK;
}

1
layout/base/src/nsFrameImageLoader.h
Просмотреть файл

@ -57,7 +57,6 @@ public:
NS_IMETHOD GetImage(nsIImage*& aResult) const;
NS_IMETHOD GetSize(nsSize& aResult) const;
NS_IMETHOD GetImageLoadStatus(PRIntn& aLoadStatus) const;
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsFrameImageLoader();

12
layout/base/src/nsGenericDOMDataNode.cpp
Просмотреть файл

@ -682,15 +682,3 @@ nsGenericDOMDataNode::GetRangeList(nsVoidArray*& aResult) const
aResult = mRangeList;
return NS_OK;
}
//----------------------------------------------------------------------
// XXX not really implemented (yet)
nsresult
nsGenericDOMDataNode::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}

4
layout/base/src/nsGenericDOMDataNode.h
Просмотреть файл

@ -175,7 +175,6 @@ struct nsGenericDOMDataNode {
nsresult GetRangeList(nsVoidArray*& aResult) const;
// Implementation for nsIContent
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult BeginConvertToXIF(nsXIFConverter& aConverter) const;
nsresult ConvertContentToXIF(nsXIFConverter& aConverter) const;
nsresult FinishConvertToXIF(nsXIFConverter& aConverter) const;
@ -442,9 +441,6 @@ struct nsGenericDOMDataNode {
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const { \
return _g.SizeOf(aHandler); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \

7
layout/base/src/nsGenericElement.cpp
Просмотреть файл

@ -1753,13 +1753,6 @@ nsGenericContainerElement::List(FILE* out, PRInt32 aIndent) const
return NS_OK;
}
nsresult
nsGenericContainerElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericContainerElement::CanContainChildren(PRBool& aResult) const
{

4
layout/base/src/nsGenericElement.h
Просмотреть файл

@ -247,7 +247,6 @@ public:
nsIAtom*& aName) const;
nsresult GetAttributeCount(PRInt32& aResult) const;
nsresult List(FILE* out, PRInt32 aIndent) const;
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const;
nsresult ChildCount(PRInt32& aResult) const;
nsresult ChildAt(PRInt32 aIndex, nsIContent*& aResult) const;
@ -479,9 +478,6 @@ public:
NS_IMETHOD FinishConvertToXIF(nsXIFConverter& aConverter) const { \
return _g.FinishConvertToXIF(aConverter); \
} \
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const { \
return _g.SizeOf(aHandler); \
} \
NS_IMETHOD HandleDOMEvent(nsIPresContext& aPresContext, \
nsEvent* aEvent, \
nsIDOMEvent** aDOMEvent, \

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

@ -696,9 +696,9 @@ nsAreaFrame::GetFrameName(nsString& aResult) const
// XXX The base class implementation should handle listing all of
// the additional named child lists...
NS_IMETHODIMP
nsAreaFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const
nsAreaFrame::List(FILE* out, PRInt32 aIndent) const
{
nsresult rv = nsBlockFrame::List(out, aIndent, aFilter);
nsresult rv = nsBlockFrame::List(out, aIndent);
// Output absolutely positioned frames
if (mAbsoluteFrames.NotEmpty()) {
@ -707,7 +707,7 @@ nsAreaFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const
nsIFrame* f = mAbsoluteFrames.FirstChild();
while (nsnull != f) {
f->List(out, aIndent+1, aFilter);
f->List(out, aIndent+1);
f->GetNextSibling(f);
}

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

@ -73,7 +73,7 @@ public:
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
protected:

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -64,7 +64,7 @@ public:
nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const = 0;
NS_IMETHOD VerifyTree() const;
NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame);
@ -320,7 +320,7 @@ public:
NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame);
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow overrides
NS_IMETHOD Reflow(nsIPresContext& aPresContext,

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -55,7 +55,7 @@ nsBulletFrame::GetFrameName(nsString& aResult) const
}
NS_IMETHODIMP
nsBulletFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBulletFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
for (i = aIndent; --i >= 0; ) fputs(" ", out);

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

@ -38,7 +38,7 @@ public:
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer);
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow
NS_IMETHOD Reflow(nsIPresContext& aPresContext,

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

@ -348,7 +348,6 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame,
nsReflowStatus& aStatus)
{
NS_PRECONDITION(aReflowState.frame == aKidFrame, "bad reflow state");
NS_PRECONDITION(IsChild(aKidFrame), "not my child");
// Query for the nsIHTMLReflow interface
nsIHTMLReflow* htmlReflow;
@ -559,11 +558,8 @@ nsContainerFrame::RemoveFrame(nsIFrame* aRemovedFrame)
// Debugging
NS_IMETHODIMP
nsContainerFrame::List(FILE* out, PRInt32 aIndent,
nsIListFilter *aFilter) const
nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -573,55 +569,46 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent,
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull==aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(out, aIndent);
// Indent
IndentBy(out, aIndent);
// Output the tag
ListTag(out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
// Output the children
if (mFrames.NotEmpty()) {
if (outputMe) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
if (outputMe) {
IndentBy(out, aIndent);
fputs(">\n", out);
child->List(out, aIndent + 1);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (outputMe) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
}
return NS_OK;

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

@ -41,7 +41,7 @@ public:
nsIFrame** aFrame);
NS_IMETHOD ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aParentContext);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow overrides
NS_IMETHOD DidReflow(nsIPresContext& aPresContext,

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

@ -88,70 +88,6 @@ NS_LAYOUT PRBool nsIFrame::GetShowFrameBorders()
return gShowFrameBorders;
}
////////////////////////////////////////////////
// Debug Listing Helper Class
////////////////////////////////////////////////
class TableListFilter : public nsIListFilter
{
private:
static char* kTagTable[];
public:
TableListFilter()
{};
virtual ~TableListFilter()
{};
virtual PRBool OutputTag(nsAutoString *aTag) const
{
PRBool result = PR_FALSE;
if (nsnull!=aTag && 0!=aTag->Length())
{
for (PRInt32 i=0; ; i++)
{
const char *tableTag = kTagTable[i];
if (nsnull==tableTag)
break;
if (aTag->EqualsIgnoreCase(tableTag))
{
result = PR_TRUE;
break;
}
}
}
return result;
};
};
char* TableListFilter::kTagTable[] = {
"table",
"tbody", "thead", "tfoot",
"tr", "td", "th",
"colgroup", "col",
//"caption", captions are left out because there's no caption frame
// to hang a decent output method on.
""
};
NS_LAYOUT nsIListFilter * nsIFrame::GetFilter(nsString *aFilterName)
{
nsIListFilter *result = nsnull;
if (nsnull!=aFilterName)
{
if (aFilterName->EqualsIgnoreCase("table"))
{
static nsIListFilter * tableListFilter;
if (nsnull==tableListFilter)
tableListFilter = new TableListFilter();
result = tableListFilter;
}
}
return result;
}
/**
* Note: the log module is created during library initialization which
* means that you cannot perform logging before then.
@ -412,31 +348,15 @@ nsFrame::DeleteFrame(nsIPresContext& aPresContext)
}
NS_IMETHODIMP
nsFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
// Note: style context's are accounted for via the style system's
// sizeof support
// Note: content is accounted for via the content system's sizeof
// support
}
NS_IMETHODIMP nsFrame::GetContent(nsIContent*& aContent) const
nsFrame::GetContent(nsIContent*& aContent) const
{
NS_IF_ADDREF(mContent);
aContent = mContent;
return NS_OK;
}
NS_IMETHODIMP nsFrame::GetStyleContext(nsIStyleContext*& aStyleContext) const
NS_IMETHODIMP
nsFrame::GetStyleContext(nsIStyleContext*& aStyleContext) const
{
NS_ASSERTION(nsnull != mStyleContext, "frame should always have style context");
NS_IF_ADDREF(mStyleContext);
@ -1638,10 +1558,8 @@ PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame)
// Debugging
NS_IMETHODIMP
nsFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -1652,22 +1570,20 @@ nsFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
}
}
if ((nsnull==aFilter) || aFilter->OutputTag(&tagString)) {
// Indent
IndentBy(out, aIndent);
// Indent
IndentBy(out, aIndent);
// Output the tag and rect
ListTag(out);
if (nsnull != mView) {
fprintf(out, " [view=%p]", mView);
}
fputs(" ", out);
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
// Output the tag and rect
ListTag(out);
if (nsnull != mView) {
fprintf(out, " [view=%p]", mView);
}
fputs(" ", out);
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
return NS_OK;
}

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

@ -137,7 +137,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame);
NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext);
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
NS_IMETHOD GetContent(nsIContent*& aContent) const;
NS_IMETHOD GetStyleContext(nsIStyleContext*& aStyleContext) const;
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
@ -203,7 +202,7 @@ public:
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling);
NS_IMETHOD IsTransparent(PRBool& aTransparent) const;
NS_IMETHOD Scrolled(nsIView *aView);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD DumpRegressionData(FILE* out, PRInt32 aIndent);
NS_IMETHOD VerifyTree() const;
@ -340,8 +339,6 @@ protected:
// Style post processing hook
NS_IMETHOD DidSetStyleContext(nsIPresContext* aPresContext);
void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
/**
* Dump out the "base classes" regression data. This should dump
* out the interior data, not the "frame" XML container. And it

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

@ -1691,6 +1691,6 @@ NS_IMETHODIMP nsHTMLFramesetBlankFrame::List(FILE* out, PRInt32 aIndent) const
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out); // Indent
fprintf(out, "%X BLANK \n", this);
return nsLeafFrame::List(out, aIndent, nsnull);
return nsLeafFrame::List(out, aIndent);
}

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

@ -31,13 +31,11 @@ class nsIFrame;
class nsIPresContext;
class nsIPresShell;
class nsIRenderingContext;
class nsISizeOfHandler;
class nsISpaceManager;
class nsIStyleContext;
class nsIView;
class nsIWidget;
class nsIReflowCommand;
class nsIListFilter;
class nsAutoString;
class nsString;
@ -264,13 +262,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame) = 0;
/**
* Add this object's size information to the sizeof handler. Note that
* this does <b>not</b> add in the size of content, style, or view's
* (those are sized seperately).
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
/**
* Deletes this frame and each of its child frames (recursively calls
* DeleteFrame() for each child)
@ -517,9 +508,7 @@ public:
NS_IMETHOD Scrolled(nsIView *aView) = 0;
// Debugging
NS_IMETHOD List(FILE* out,
PRInt32 aIndent,
nsIListFilter *aFilter) const = 0;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const = 0;
/**
* Get a printable from of the name of the frame type.
@ -542,8 +531,6 @@ public:
NS_IMETHOD GetSelected(PRBool *aSelected, PRInt32 *aBeginOffset, PRInt32 *aEndOffset, PRInt32 *aBeginContentOffset) = 0;
static NS_LAYOUT nsIListFilter * GetFilter(nsString *aFilterName);
/**
* See if tree verification is enabled. To enable tree verification add
* "frameverifytree:1" to your NSPR_LOG_MODULES environment variable
@ -578,11 +565,4 @@ private:
NS_IMETHOD_(nsrefcnt) Release(void) = 0;
};
/* ----- nsIListFilter definition ----- */
class nsIListFilter
{
public:
virtual PRBool OutputTag(nsAutoString *aTag) const = 0;
};
#endif /* nsIFrame_h___ */

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

@ -84,18 +84,6 @@ nsHTMLImageLoader::~nsHTMLImageLoader()
NS_IF_RELEASE(mBaseURL);
}
void
nsHTMLImageLoader::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (!aHandler->HaveSeen(mURLSpec)) {
mURLSpec->SizeOf(aHandler);
}
if (!aHandler->HaveSeen(mImageLoader)) {
mImageLoader->SizeOf(aHandler);
}
}
nsIImage*
nsHTMLImageLoader::GetImage()
{
@ -361,21 +349,6 @@ nsImageFrame::Init(nsIPresContext& aPresContext,
return rv;
}
NS_IMETHODIMP
nsImageFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
nsImageFrame::SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsImageFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
ImageFrameSuper::SizeOfWithoutThis(aHandler);
mImageLoader.SizeOf(aHandler);
}
static nsresult
UpdateImageFrame(nsIPresContext& aPresContext, nsIFrame* aFrame,
PRIntn aStatus)

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

@ -54,7 +54,7 @@ ListFloaters(FILE* out, PRInt32 aIndent, nsVoidArray* aFloaters)
fprintf(out, "placeholder@%p\n", ph);
nsIFrame* frame = ph->GetAnchoredItem();
if (nsnull != frame) {
frame->List(out, aIndent + 1, nsnull);
frame->List(out, aIndent + 1);
}
}
}
@ -71,44 +71,39 @@ nsLineBox::StateToString(char* aBuf, PRInt32 aBufSize) const
}
void
nsLineBox::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter,
PRBool aOutputMe) const
nsLineBox::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
if (aOutputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
char cbuf[100];
fprintf(out, "line %p: count=%d state=%s ",
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
if (0 != mCarriedOutTopMargin) {
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
}
if (0 != mCarriedOutBottomMargin) {
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
}
out << mBounds;
fprintf(out, " ca=");
out << mCombinedArea;
fprintf(out, " <\n");
for (i = aIndent; --i >= 0; ) fputs(" ", out);
char cbuf[100];
fprintf(out, "line %p: count=%d state=%s ",
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
if (0 != mCarriedOutTopMargin) {
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
}
if (0 != mCarriedOutBottomMargin) {
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
}
out << mBounds;
fprintf(out, " ca=");
out << mCombinedArea;
fprintf(out, " <\n");
nsIFrame* frame = mFirstChild;
PRInt32 n = ChildCount();
while (--n >= 0) {
frame->List(out, aIndent + 1, aFilter);
frame->List(out, aIndent + 1);
frame->GetNextSibling(frame);
}
if (aOutputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
if (nsnull != mFloaters) {
fputs("> floaters <\n", out);
ListFloaters(out, aIndent + 1, mFloaters);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
if (nsnull != mFloaters) {
fputs("> floaters <\n", out);
ListFloaters(out, aIndent + 1, mFloaters);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
}
fputs(">\n", out);
}
fputs(">\n", out);
}
nsIFrame*

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

@ -88,8 +88,7 @@ public:
static nsLineBox* FindLineContaining(nsLineBox* aLine, nsIFrame* aFrame);
void List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter,
PRBool aOutputMe) const;
void List(FILE* out, PRInt32 aIndent) const;
PRInt32 ChildCount() const {
return PRInt32(mChildCount);

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

@ -21,28 +21,6 @@
#include "nsIStyleContext.h"
#include "nsISizeOfHandler.h"
NS_IMETHODIMP
nsSplittableFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
nsSplittableFrame::SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsSplittableFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
nsFrame::SizeOfWithoutThis(aHandler);
if (!aHandler->HaveSeen(mPrevInFlow)) {
mPrevInFlow->SizeOf(aHandler);
}
if (!aHandler->HaveSeen(mNextInFlow)) {
mNextInFlow->SizeOf(aHandler);
}
}
// Flow member functions
NS_IMETHODIMP
nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{

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

@ -24,7 +24,6 @@
class nsSplittableFrame : public nsFrame
{
public:
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
// CreateContinuingFrame() does the default behavior of using the
// content delegate to create a new frame
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
@ -55,8 +54,6 @@ public:
nsIFrame* GetNextInFlow();
protected:
void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent);
nsIFrame* mPrevInFlow;

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

@ -111,7 +111,7 @@ public:
nsIContent* aChild,
nsISupports* aSubContent);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
@ -2297,7 +2297,7 @@ TextFrame::GetFrameName(nsString& aResult) const
}
NS_IMETHODIMP
TextFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
TextFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
for (i = aIndent; --i >= 0; ) fputs(" ", out);

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

@ -696,9 +696,9 @@ nsAreaFrame::GetFrameName(nsString& aResult) const
// XXX The base class implementation should handle listing all of
// the additional named child lists...
NS_IMETHODIMP
nsAreaFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const
nsAreaFrame::List(FILE* out, PRInt32 aIndent) const
{
nsresult rv = nsBlockFrame::List(out, aIndent, aFilter);
nsresult rv = nsBlockFrame::List(out, aIndent);
// Output absolutely positioned frames
if (mAbsoluteFrames.NotEmpty()) {
@ -707,7 +707,7 @@ nsAreaFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const
nsIFrame* f = mAbsoluteFrames.FirstChild();
while (nsnull != f) {
f->List(out, aIndent+1, aFilter);
f->List(out, aIndent+1);
f->GetNextSibling(f);
}

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

@ -73,7 +73,7 @@ public:
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
protected:

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -64,7 +64,7 @@ public:
nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const = 0;
NS_IMETHOD VerifyTree() const;
NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame);
@ -320,7 +320,7 @@ public:
NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
NS_IMETHOD GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame);
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow overrides
NS_IMETHOD Reflow(nsIPresContext& aPresContext,

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -503,7 +503,7 @@ nsBaseIBFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_METHOD
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBaseIBFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
@ -516,51 +516,47 @@ nsBaseIBFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(stdout, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
IndentBy(stdout, aIndent);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output the text-runs
if (outputMe) {
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
}
aIndent--;
IndentBy(stdout, aIndent);
fputs(">\n", out);
return NS_OK;
}
@ -4302,12 +4298,10 @@ ListTextRuns(FILE* out, PRInt32 aIndent, nsTextRun* aRuns)
}
NS_METHOD
nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -4317,92 +4311,80 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull == aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Indent
for (i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
// Output the flow linkage
if (nsnull != mPrevInFlow) {
fprintf(out, " prev-in-flow=%p", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, " next-in-flow=%p", mNextInFlow);
}
// Output the rect and state
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
aIndent++;
// Output bullet first
if (nsnull != mBullet) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
}
mBullet->List(out, aIndent+1, aFilter);
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "bullet <\n");
mBullet->List(out, aIndent+1);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the lines
if (nsnull != mLines) {
nsLineBox* line = mLines;
while (nsnull != line) {
line->List(out, aIndent, aFilter, outputMe);
line->List(out, aIndent);
line = line->mNext;
}
}
// Output floaters next
if (mFloaters.NotEmpty()) {
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
}
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "all-floaters <\n");
nsIFrame* floater = mFloaters.FirstChild();
while (nsnull != floater) {
floater->List(out, aIndent+1, aFilter);
floater->List(out, aIndent+1);
floater->GetNextSibling(floater);
}
if (outputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
}
// Output the text-runs
if (outputMe) {
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
// Output the text-runs
if (nsnull != mTextRuns) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs("text-runs <\n", out);
ListTextRuns(out, aIndent + 1, mTextRuns);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
}
aIndent--;
for (i = aIndent; --i >= 0; ) fputs(" ", out);
fputs(">\n", out);
return NS_OK;
}

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

@ -70,7 +70,7 @@ public:
nsIFrame*& aContinuingFrame);
NS_IMETHOD DidSetStyleContext(nsIPresContext* aPresContext);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter* aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
protected:

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

@ -55,7 +55,7 @@ nsBulletFrame::GetFrameName(nsString& aResult) const
}
NS_IMETHODIMP
nsBulletFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsBulletFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
for (i = aIndent; --i >= 0; ) fputs(" ", out);

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

@ -38,7 +38,7 @@ public:
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer);
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow
NS_IMETHOD Reflow(nsIPresContext& aPresContext,

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

@ -348,7 +348,6 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame,
nsReflowStatus& aStatus)
{
NS_PRECONDITION(aReflowState.frame == aKidFrame, "bad reflow state");
NS_PRECONDITION(IsChild(aKidFrame), "not my child");
// Query for the nsIHTMLReflow interface
nsIHTMLReflow* htmlReflow;
@ -559,11 +558,8 @@ nsContainerFrame::RemoveFrame(nsIFrame* aRemovedFrame)
// Debugging
NS_IMETHODIMP
nsContainerFrame::List(FILE* out, PRInt32 aIndent,
nsIListFilter *aFilter) const
nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -573,55 +569,46 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent,
NS_RELEASE(tag);
}
}
PRBool outputMe = (nsnull==aFilter) || aFilter->OutputTag(&tagString);
if (outputMe) {
// Indent
IndentBy(out, aIndent);
// Indent
IndentBy(out, aIndent);
// Output the tag
ListTag(out);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
// Output the children
if (mFrames.NotEmpty()) {
if (outputMe) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
if (outputMe) {
IndentBy(out, aIndent);
fputs(">\n", out);
child->List(out, aIndent + 1);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (outputMe) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
}
return NS_OK;

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

@ -41,7 +41,7 @@ public:
nsIFrame** aFrame);
NS_IMETHOD ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aParentContext);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
// nsIHTMLReflow overrides
NS_IMETHOD DidReflow(nsIPresContext& aPresContext,

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

@ -88,70 +88,6 @@ NS_LAYOUT PRBool nsIFrame::GetShowFrameBorders()
return gShowFrameBorders;
}
////////////////////////////////////////////////
// Debug Listing Helper Class
////////////////////////////////////////////////
class TableListFilter : public nsIListFilter
{
private:
static char* kTagTable[];
public:
TableListFilter()
{};
virtual ~TableListFilter()
{};
virtual PRBool OutputTag(nsAutoString *aTag) const
{
PRBool result = PR_FALSE;
if (nsnull!=aTag && 0!=aTag->Length())
{
for (PRInt32 i=0; ; i++)
{
const char *tableTag = kTagTable[i];
if (nsnull==tableTag)
break;
if (aTag->EqualsIgnoreCase(tableTag))
{
result = PR_TRUE;
break;
}
}
}
return result;
};
};
char* TableListFilter::kTagTable[] = {
"table",
"tbody", "thead", "tfoot",
"tr", "td", "th",
"colgroup", "col",
//"caption", captions are left out because there's no caption frame
// to hang a decent output method on.
""
};
NS_LAYOUT nsIListFilter * nsIFrame::GetFilter(nsString *aFilterName)
{
nsIListFilter *result = nsnull;
if (nsnull!=aFilterName)
{
if (aFilterName->EqualsIgnoreCase("table"))
{
static nsIListFilter * tableListFilter;
if (nsnull==tableListFilter)
tableListFilter = new TableListFilter();
result = tableListFilter;
}
}
return result;
}
/**
* Note: the log module is created during library initialization which
* means that you cannot perform logging before then.
@ -412,31 +348,15 @@ nsFrame::DeleteFrame(nsIPresContext& aPresContext)
}
NS_IMETHODIMP
nsFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
// Note: style context's are accounted for via the style system's
// sizeof support
// Note: content is accounted for via the content system's sizeof
// support
}
NS_IMETHODIMP nsFrame::GetContent(nsIContent*& aContent) const
nsFrame::GetContent(nsIContent*& aContent) const
{
NS_IF_ADDREF(mContent);
aContent = mContent;
return NS_OK;
}
NS_IMETHODIMP nsFrame::GetStyleContext(nsIStyleContext*& aStyleContext) const
NS_IMETHODIMP
nsFrame::GetStyleContext(nsIStyleContext*& aStyleContext) const
{
NS_ASSERTION(nsnull != mStyleContext, "frame should always have style context");
NS_IF_ADDREF(mStyleContext);
@ -1638,10 +1558,8 @@ PRInt32 nsFrame::ContentIndexInContainer(const nsIFrame* aFrame)
// Debugging
NS_IMETHODIMP
nsFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
nsFrame::List(FILE* out, PRInt32 aIndent) const
{
// if a filter is present, only output this frame if the filter says
// we should
nsAutoString tagString;
if (nsnull != mContent) {
nsIAtom* tag;
@ -1652,22 +1570,20 @@ nsFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
}
}
if ((nsnull==aFilter) || aFilter->OutputTag(&tagString)) {
// Indent
IndentBy(out, aIndent);
// Indent
IndentBy(out, aIndent);
// Output the tag and rect
ListTag(out);
if (nsnull != mView) {
fprintf(out, " [view=%p]", mView);
}
fputs(" ", out);
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
// Output the tag and rect
ListTag(out);
if (nsnull != mView) {
fprintf(out, " [view=%p]", mView);
}
fputs(" ", out);
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
return NS_OK;
}

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

@ -137,7 +137,6 @@ public:
nsIAtom* aListName,
nsIFrame* aOldFrame);
NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext);
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
NS_IMETHOD GetContent(nsIContent*& aContent) const;
NS_IMETHOD GetStyleContext(nsIStyleContext*& aStyleContext) const;
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
@ -203,7 +202,7 @@ public:
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling);
NS_IMETHOD IsTransparent(PRBool& aTransparent) const;
NS_IMETHOD Scrolled(nsIView *aView);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
NS_IMETHOD DumpRegressionData(FILE* out, PRInt32 aIndent);
NS_IMETHOD VerifyTree() const;
@ -340,8 +339,6 @@ protected:
// Style post processing hook
NS_IMETHOD DidSetStyleContext(nsIPresContext* aPresContext);
void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
/**
* Dump out the "base classes" regression data. This should dump
* out the interior data, not the "frame" XML container. And it

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

@ -27,7 +27,6 @@ class nsIFrame;
class nsIFrameImageLoader;
class nsImageMap;
class nsIPresContext;
class nsISizeOfHandler;
class nsIURL;
struct nsHTMLReflowState;
struct nsHTMLReflowMetrics;
@ -81,8 +80,6 @@ public:
PRBool GetLoadImageFailed() const;
void SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsIFrameImageLoader* mImageLoader;
PRPackedBool mLoadImageFailed;
@ -103,7 +100,6 @@ public:
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aContext);
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
NS_IMETHOD Paint(nsIPresContext& aPresContext,
nsIRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
@ -125,7 +121,6 @@ public:
protected:
virtual ~nsImageFrame();
void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
virtual void GetDesiredSize(nsIPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,

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

@ -84,18 +84,6 @@ nsHTMLImageLoader::~nsHTMLImageLoader()
NS_IF_RELEASE(mBaseURL);
}
void
nsHTMLImageLoader::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (!aHandler->HaveSeen(mURLSpec)) {
mURLSpec->SizeOf(aHandler);
}
if (!aHandler->HaveSeen(mImageLoader)) {
mImageLoader->SizeOf(aHandler);
}
}
nsIImage*
nsHTMLImageLoader::GetImage()
{
@ -361,21 +349,6 @@ nsImageFrame::Init(nsIPresContext& aPresContext,
return rv;
}
NS_IMETHODIMP
nsImageFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
nsImageFrame::SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsImageFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
ImageFrameSuper::SizeOfWithoutThis(aHandler);
mImageLoader.SizeOf(aHandler);
}
static nsresult
UpdateImageFrame(nsIPresContext& aPresContext, nsIFrame* aFrame,
PRIntn aStatus)

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

@ -54,7 +54,7 @@ ListFloaters(FILE* out, PRInt32 aIndent, nsVoidArray* aFloaters)
fprintf(out, "placeholder@%p\n", ph);
nsIFrame* frame = ph->GetAnchoredItem();
if (nsnull != frame) {
frame->List(out, aIndent + 1, nsnull);
frame->List(out, aIndent + 1);
}
}
}
@ -71,44 +71,39 @@ nsLineBox::StateToString(char* aBuf, PRInt32 aBufSize) const
}
void
nsLineBox::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter,
PRBool aOutputMe) const
nsLineBox::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
if (aOutputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
char cbuf[100];
fprintf(out, "line %p: count=%d state=%s ",
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
if (0 != mCarriedOutTopMargin) {
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
}
if (0 != mCarriedOutBottomMargin) {
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
}
out << mBounds;
fprintf(out, " ca=");
out << mCombinedArea;
fprintf(out, " <\n");
for (i = aIndent; --i >= 0; ) fputs(" ", out);
char cbuf[100];
fprintf(out, "line %p: count=%d state=%s ",
this, ChildCount(), StateToString(cbuf, sizeof(cbuf)));
if (0 != mCarriedOutTopMargin) {
fprintf(out, "tm=%d ", mCarriedOutTopMargin);
}
if (0 != mCarriedOutBottomMargin) {
fprintf(out, "bm=%d ", mCarriedOutBottomMargin);
}
out << mBounds;
fprintf(out, " ca=");
out << mCombinedArea;
fprintf(out, " <\n");
nsIFrame* frame = mFirstChild;
PRInt32 n = ChildCount();
while (--n >= 0) {
frame->List(out, aIndent + 1, aFilter);
frame->List(out, aIndent + 1);
frame->GetNextSibling(frame);
}
if (aOutputMe) {
for (i = aIndent; --i >= 0; ) fputs(" ", out);
if (nsnull != mFloaters) {
fputs("> floaters <\n", out);
ListFloaters(out, aIndent + 1, mFloaters);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
if (nsnull != mFloaters) {
fputs("> floaters <\n", out);
ListFloaters(out, aIndent + 1, mFloaters);
for (i = aIndent; --i >= 0; ) fputs(" ", out);
}
fputs(">\n", out);
}
fputs(">\n", out);
}
nsIFrame*

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

@ -88,8 +88,7 @@ public:
static nsLineBox* FindLineContaining(nsLineBox* aLine, nsIFrame* aFrame);
void List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter,
PRBool aOutputMe) const;
void List(FILE* out, PRInt32 aIndent) const;
PRInt32 ChildCount() const {
return PRInt32(mChildCount);

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

@ -1421,8 +1421,8 @@ LogVerifyMessage(nsIFrame* k1, nsIFrame* k2, const char* aMsg,
printf(" %s\n", aMsg);
if (gVerifyReflowAll) {
k1->List(stdout, 1, nsnull);
k2->List(stdout, 1, nsnull);
k1->List(stdout, 1);
k2->List(stdout, 1);
}
}

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

@ -21,28 +21,6 @@
#include "nsIStyleContext.h"
#include "nsISizeOfHandler.h"
NS_IMETHODIMP
nsSplittableFrame::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
nsSplittableFrame::SizeOfWithoutThis(aHandler);
return NS_OK;
}
void
nsSplittableFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
{
nsFrame::SizeOfWithoutThis(aHandler);
if (!aHandler->HaveSeen(mPrevInFlow)) {
mPrevInFlow->SizeOf(aHandler);
}
if (!aHandler->HaveSeen(mNextInFlow)) {
mNextInFlow->SizeOf(aHandler);
}
}
// Flow member functions
NS_IMETHODIMP
nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const
{

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

@ -24,7 +24,6 @@
class nsSplittableFrame : public nsFrame
{
public:
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
// CreateContinuingFrame() does the default behavior of using the
// content delegate to create a new frame
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
@ -55,8 +54,6 @@ public:
nsIFrame* GetNextInFlow();
protected:
void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const;
virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent);
nsIFrame* mPrevInFlow;

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

@ -111,7 +111,7 @@ public:
nsIContent* aChild,
nsISupports* aSubContent);
NS_IMETHOD List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
NS_IMETHOD GetFrameName(nsString& aResult) const;
@ -2297,7 +2297,7 @@ TextFrame::GetFrameName(nsString& aResult) const
}
NS_IMETHODIMP
TextFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
TextFrame::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 i;
for (i = aIndent; --i >= 0; ) fputs(" ", out);

15
layout/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -1916,14 +1916,6 @@ nsGenericHTMLLeafElement::GetChildNodes(nsIDOMNodeList** aChildNodes)
return slots->mChildNodes->QueryInterface(kIDOMNodeListIID, (void **)aChildNodes);
}
// XXX not really implemented (yet)
nsresult
nsGenericHTMLLeafElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericHTMLLeafElement::BeginConvertToXIF(nsXIFConverter& aConverter) const
{
@ -2383,13 +2375,6 @@ nsGenericHTMLContainerElement::Compact()
return NS_OK;
}
nsresult
nsGenericHTMLContainerElement::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
return NS_OK;
}
nsresult
nsGenericHTMLContainerElement::CanContainChildren(PRBool& aResult) const
{

2
layout/html/content/src/nsGenericHTMLElement.h
Просмотреть файл

@ -287,7 +287,6 @@ public:
nsresult Compact() {
return NS_OK;
}
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const {
aResult = PR_FALSE;
return NS_OK;
@ -347,7 +346,6 @@ public:
nsresult ConvertContentToXIF(nsXIFConverter& aConverter) const;
nsresult FinishConvertToXIF(nsXIFConverter& aConverter) const;
nsresult Compact();
nsresult SizeOf(nsISizeOfHandler* aHandler) const;
nsresult CanContainChildren(PRBool& aResult) const;
nsresult ChildCount(PRInt32& aResult) const;
nsresult ChildAt(PRInt32 aIndex, nsIContent*& aResult) const;

2
layout/html/content/src/nsHTMLTableRowElement.cpp
Просмотреть файл

@ -121,7 +121,7 @@ void TempList(nsIDOMHTMLTableElement* aTable) {
nsIFrame* rootFrame;
shell->GetRootFrame(rootFrame);
if (nsnull != rootFrame) {
rootFrame->List(stdout, 0, nsnull);
rootFrame->List(stdout, 0);
}
}
NS_RELEASE(shell);

2
layout/html/document/src/nsFrameSetFrame.cpp
Просмотреть файл

@ -1691,6 +1691,6 @@ NS_IMETHODIMP nsHTMLFramesetBlankFrame::List(FILE* out, PRInt32 aIndent) const
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out); // Indent
fprintf(out, "%X BLANK \n", this);
return nsLeafFrame::List(out, aIndent, nsnull);
return nsLeafFrame::List(out, aIndent);
}

2
layout/html/document/src/ua.css
Просмотреть файл

@ -495,7 +495,7 @@ NOFRAMES {
/* Pseudo-element style */
:IB-PSEUDO {
:MOZ-ANONYMOUS-BLOCK {
display: block;
}

34
layout/html/style/src/nsHTMLAttributes.cpp
Просмотреть файл

@ -26,7 +26,6 @@
#include "nsIStyleContext.h"
#include "nsHTMLAtoms.h"
#include "nsIHTMLContent.h"
#include "nsISizeOfHandler.h"
#include "nsVoidArray.h"
static NS_DEFINE_IID(kIHTMLAttributesIID, NS_IHTML_ATTRIBUTES_IID);
@ -71,8 +70,6 @@ struct HTMLAttribute {
NS_IF_RELEASE(mAttribute);
}
void SizeOf(nsISizeOfHandler* aHandler) const;
HTMLAttribute& operator=(const HTMLAttribute& aCopy)
{
NS_IF_RELEASE(mAttribute);
@ -151,20 +148,6 @@ struct HTMLAttribute {
HTMLAttribute* mNext;
};
void
HTMLAttribute::SizeOf(nsISizeOfHandler* aHandler) const
{
if (!aHandler->HaveSeen(mAttribute)) {
mAttribute->SizeOf(aHandler);
}
aHandler->Add(sizeof(*this));
aHandler->Add((size_t) (- ((PRInt32) sizeof(mValue)) ) );
mValue.SizeOf(aHandler);
if (!aHandler->HaveSeen(mNext)) {
mNext->SizeOf(aHandler);
}
}
// ----------------
struct nsClassList {
@ -245,11 +228,6 @@ public:
NS_IMETHOD GetStrength(PRInt32& aStrength) const;
NS_IMETHOD MapStyleInto(nsIStyleContext* aContext, nsIPresContext* aPresContext);
/**
* Add this object's size information to the sizeof handler.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
private:
@ -859,18 +837,6 @@ HTMLAttributesImpl::GetStrength(PRInt32& aStrength) const
return NS_OK;
}
NS_IMETHODIMP
HTMLAttributesImpl::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
// XXX mID
// XXX mClass
if (!aHandler->HaveSeen(mFirst.mNext)) {
mFirst.mNext->SizeOf(aHandler);
}
return NS_OK;
}
NS_IMETHODIMP
HTMLAttributesImpl::List(FILE* out, PRInt32 aIndent) const
{

11
layout/html/style/src/nsHTMLValue.cpp
Просмотреть файл

@ -305,14 +305,3 @@ void nsHTMLValue::ToString(nsString& aBuffer) const
aBuffer.Truncate();
AppendToString(aBuffer);
}
void
nsHTMLValue::SizeOf(nsISizeOfHandler* aHandler) const
{
aHandler->Add(sizeof(*this));
if (eHTMLUnit_String == mUnit) {
if (!aHandler->HaveSeen(mValue.mString)) {
mValue.mString->SizeOf(aHandler);
}
}
}

2
layout/html/style/src/nsHTMLValue.h
Просмотреть файл

@ -22,7 +22,6 @@
#include "nsColor.h"
#include "nsString.h"
#include "nsISupports.h"
class nsISizeOfHandler;
enum nsHTMLUnit {
eHTMLUnit_Null = 0, // (n/a) null unit, value is not specified
@ -73,7 +72,6 @@ public:
void AppendToString(nsString& aBuffer) const;
void ToString(nsString& aBuffer) const;
void SizeOf(nsISizeOfHandler* aHandler) const;
protected:
nsHTMLUnit mUnit;

6
layout/html/style/src/nsIHTMLAttributes.h
Просмотреть файл

@ -23,7 +23,6 @@
#include "nsHTMLValue.h"
#include "nsIHTMLContent.h"
class nsIAtom;
class nsISizeOfHandler;
class nsISupportsArray;
class nsIHTMLStyleSheet;
@ -67,11 +66,6 @@ public:
NS_IMETHOD SetMappingFunction(nsMapAttributesFunc aMapFunc) = 0;
NS_IMETHOD SetStyleSheet(nsIHTMLStyleSheet* aSheet) = 0;
/**
* Add this object's size information to the sizeof handler.
*/
NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0) const = 0;
};

123
layout/html/table/src/nsTableCellFrame.cpp
Просмотреть файл

@ -1033,129 +1033,6 @@ void nsTableCellFrame::RecalcLayoutData(nsTableFrame* aTableFrame,
mCalculated = NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a cell
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("td");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
#if 0 //QQQ
void nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
nsIAtom* tag;
nsAutoString tagString;
mContent->GetTag(tag);
if (tag != nsnull)
tag->ToString(tagString);
if ((nsnull==aFilter) || (PR_TRUE==aFilter->OutputTag(&tagString)))
{
PRInt32 indent;
nsIContent* cell;
this->GetContent(cell);
if (cell != nsnull)
{
/*
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
fprintf(out,"RowSpan = %d ColSpan = %d \n",cell->GetRowSpan(),cell->GetColSpan());
*/
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
fprintf(out,"Margin -- Top: %d Left: %d Bottom: %d Right: %d \n",
NSTwipsToIntPoints(mMargin.top),
NSTwipsToIntPoints(mMargin.left),
NSTwipsToIntPoints(mMargin.bottom),
NSTwipsToIntPoints(mMargin.right));
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
nscoord top,left,bottom,right;
cell->List(out,aIndent);
NS_RELEASE(cell);
}
}
// Output the children
if (nsnull != mFirstChild) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
}
for (nsIFrame* child = mFirstChild; child; NextChild(child, child)) {
child->List(out, aIndent + 1, aFilter);
}
if (PR_TRUE==outputMe)
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
}
}
}
#endif
NS_IMETHODIMP
nsTableCellFrame::GetFrameName(nsString& aResult) const
{

2
layout/html/table/src/nsTableCellFrame.h
Просмотреть файл

@ -162,8 +162,6 @@ private:
void CalculateMargins(nsTableFrame* aTableFrame,
nsVoidArray* aBoundaryCells[4]);
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
// Subclass hook for style post processing

36
layout/html/table/src/nsTableColFrame.cpp
Просмотреть файл

@ -96,42 +96,6 @@ NS_NewTableColFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableColFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a cell
if (nsnull==aFilter)
return nsFrame::List(out, aIndent, aFilter);
nsAutoString tagString("col");
if (PR_TRUE==aFilter->OutputTag(&tagString))
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
return NS_OK;
}
NS_IMETHODIMP
nsTableColFrame::GetFrameName(nsString& aResult) const
{

2
layout/html/table/src/nsTableColFrame.h
Просмотреть файл

@ -88,8 +88,6 @@ public:
/** convenience method, calls into cellmap */
PRInt32 Count() const;
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
nsTableColFrame();

56
layout/html/table/src/nsTableColGroupFrame.cpp
Просмотреть файл

@ -704,62 +704,6 @@ NS_NewTableColGroupFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableColGroupFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a colgroup
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("colgroup");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableColGroupFrame::GetFrameName(nsString& aResult) const
{

2
layout/html/table/src/nsTableColGroupFrame.h
Просмотреть файл

@ -94,8 +94,6 @@ public:
*/
//PRBool IsManufactured();
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
/** implement abstract method on nsHTMLContainerFrame */

129
layout/html/table/src/nsTableFrame.cpp
Просмотреть файл

@ -4906,135 +4906,6 @@ PRBool nsTableFrame::RequiresPass1Layout()
return (PRBool)(NS_STYLE_TABLE_LAYOUT_FIXED!=tableStyle->mLayoutStrategy);
}
/* ----- debugging methods ----- */
NS_METHOD nsTableFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a table
if (nsnull==aFilter)
{
// XXX: want this whole if-clause to be replaced by
// nsHTMLContainerFrame::List(out, aIndent, aFilter);
// but that method doesn't yet know about multiple child lists
// if a filter is present, only output this frame if the filter says
// we should
// Indent
IndentBy(out, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
// Output the children
if (mFrames.NotEmpty()) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
nsIFrame* child;
for (child = mFrames.FirstChild(); child; child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
for (child = mColGroups.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
}
}
else
{
nsAutoString tagString("table");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
if (nsnull!=mTableLayoutStrategy)
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "min=%d, max=%d, fixed=%d, cols=%d, numCols=%d\n",
mTableLayoutStrategy->GetTableMinWidth(),
mTableLayoutStrategy->GetTableMaxWidth(),
mTableLayoutStrategy->GetTableFixedWidth(),
mTableLayoutStrategy->GetCOLSAttribute(),
mTableLayoutStrategy->GetNumCols()
);
}
}
// Output the children
if (mFrames.NotEmpty())
{
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
nsIFrame* child;
for (child = mFrames.FirstChild(); child; child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
for (child = mColGroups.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
}
else
{
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableFrame::GetFrameName(nsString& aResult) const
{

2
layout/html/table/src/nsTableFrame.h
Просмотреть файл

@ -331,8 +331,6 @@ public:
virtual void AddColumnFrame (nsTableColFrame *aColFrame);
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
/** protected constructor.

56
layout/html/table/src/nsTableOuterFrame.cpp
Просмотреть файл

@ -1189,62 +1189,6 @@ NS_NewTableOuterFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableOuterFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a tbody
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("tbody");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableOuterFrame::GetFrameName(nsString& aResult) const
{

3
layout/html/table/src/nsTableOuterFrame.h
Просмотреть файл

@ -83,9 +83,6 @@ public:
*/
nscoord GetMinCaptionWidth();
/** @see nsIFrame::List */
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:

56
layout/html/table/src/nsTableRowFrame.cpp
Просмотреть файл

@ -1526,62 +1526,6 @@ NS_NewTableRowFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableRowFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a row
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("tr");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableRowFrame::GetFrameName(nsString& aResult) const
{

2
layout/html/table/src/nsTableRowFrame.h
Просмотреть файл

@ -122,8 +122,6 @@ public:
virtual PRBool Contains(const nsPoint& aPoint);
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
/** protected constructor.

59
layout/html/table/src/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -1349,65 +1349,6 @@ NS_NewTableRowGroupFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableRowGroupFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a tbody
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("tbody");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableRowGroupFrame::GetFrameName(nsString& aResult) const
{

3
layout/html/table/src/nsTableRowGroupFrame.h
Просмотреть файл

@ -102,9 +102,6 @@ public:
/** get the maximum number of columns taken up by any row in this rowgroup */
NS_METHOD GetMaxColumns(PRInt32 &aMaxColumns) const;
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
/** implement abstract method on nsHTMLContainerFrame */

2
layout/style/ua.css
Просмотреть файл

@ -495,7 +495,7 @@ NOFRAMES {
/* Pseudo-element style */
:IB-PSEUDO {
:MOZ-ANONYMOUS-BLOCK {
display: block;
}

123
layout/tables/nsTableCellFrame.cpp
Просмотреть файл

@ -1033,129 +1033,6 @@ void nsTableCellFrame::RecalcLayoutData(nsTableFrame* aTableFrame,
mCalculated = NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a cell
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("td");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
#if 0 //QQQ
void nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
nsIAtom* tag;
nsAutoString tagString;
mContent->GetTag(tag);
if (tag != nsnull)
tag->ToString(tagString);
if ((nsnull==aFilter) || (PR_TRUE==aFilter->OutputTag(&tagString)))
{
PRInt32 indent;
nsIContent* cell;
this->GetContent(cell);
if (cell != nsnull)
{
/*
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
fprintf(out,"RowSpan = %d ColSpan = %d \n",cell->GetRowSpan(),cell->GetColSpan());
*/
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
fprintf(out,"Margin -- Top: %d Left: %d Bottom: %d Right: %d \n",
NSTwipsToIntPoints(mMargin.top),
NSTwipsToIntPoints(mMargin.left),
NSTwipsToIntPoints(mMargin.bottom),
NSTwipsToIntPoints(mMargin.right));
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);
nscoord top,left,bottom,right;
cell->List(out,aIndent);
NS_RELEASE(cell);
}
}
// Output the children
if (nsnull != mFirstChild) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
}
for (nsIFrame* child = mFirstChild; child; NextChild(child, child)) {
child->List(out, aIndent + 1, aFilter);
}
if (PR_TRUE==outputMe)
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
}
}
}
#endif
NS_IMETHODIMP
nsTableCellFrame::GetFrameName(nsString& aResult) const
{

2
layout/tables/nsTableCellFrame.h
Просмотреть файл

@ -162,8 +162,6 @@ private:
void CalculateMargins(nsTableFrame* aTableFrame,
nsVoidArray* aBoundaryCells[4]);
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
// Subclass hook for style post processing

36
layout/tables/nsTableColFrame.cpp
Просмотреть файл

@ -96,42 +96,6 @@ NS_NewTableColFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableColFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a cell
if (nsnull==aFilter)
return nsFrame::List(out, aIndent, aFilter);
nsAutoString tagString("col");
if (PR_TRUE==aFilter->OutputTag(&tagString))
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
return NS_OK;
}
NS_IMETHODIMP
nsTableColFrame::GetFrameName(nsString& aResult) const
{

2
layout/tables/nsTableColFrame.h
Просмотреть файл

@ -88,8 +88,6 @@ public:
/** convenience method, calls into cellmap */
PRInt32 Count() const;
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
nsTableColFrame();

56
layout/tables/nsTableColGroupFrame.cpp
Просмотреть файл

@ -704,62 +704,6 @@ NS_NewTableColGroupFrame(nsIFrame*& aResult)
return NS_OK;
}
/* ----- debugging methods ----- */
NS_METHOD nsTableColGroupFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a colgroup
if (nsnull==aFilter)
return nsContainerFrame::List(out, aIndent, aFilter);
nsAutoString tagString("colgroup");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
}
// Output the children
if (mFrames.NotEmpty()) {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
} else {
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableColGroupFrame::GetFrameName(nsString& aResult) const
{

2
layout/tables/nsTableColGroupFrame.h
Просмотреть файл

@ -94,8 +94,6 @@ public:
*/
//PRBool IsManufactured();
NS_IMETHOD List(FILE* out = stdout, PRInt32 aIndent = 0, nsIListFilter *aFilter = nsnull) const;
protected:
/** implement abstract method on nsHTMLContainerFrame */

129
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -4906,135 +4906,6 @@ PRBool nsTableFrame::RequiresPass1Layout()
return (PRBool)(NS_STYLE_TABLE_LAYOUT_FIXED!=tableStyle->mLayoutStrategy);
}
/* ----- debugging methods ----- */
NS_METHOD nsTableFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
{
// if a filter is present, only output this frame if the filter says we should
// since this could be any "tag" with the right display type, we'll
// just pretend it's a table
if (nsnull==aFilter)
{
// XXX: want this whole if-clause to be replaced by
// nsHTMLContainerFrame::List(out, aIndent, aFilter);
// but that method doesn't yet know about multiple child lists
// if a filter is present, only output this frame if the filter says
// we should
// Indent
IndentBy(out, aIndent);
// Output the tag
ListTag(out);
nsIView* view;
GetView(view);
if (nsnull != view) {
fprintf(out, " [view=%p]", view);
}
if (nsnull != mPrevInFlow) {
fprintf(out, "prev-in-flow=%p ", mPrevInFlow);
}
if (nsnull != mNextInFlow) {
fprintf(out, "next-in-flow=%p ", mNextInFlow);
}
// Output the rect
out << mRect;
// Output the children
if (mFrames.NotEmpty()) {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<\n", out);
nsIFrame* child;
for (child = mFrames.FirstChild(); child; child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
for (child = mColGroups.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
IndentBy(out, aIndent);
fputs(">\n", out);
} else {
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("<>\n", out);
}
}
else
{
nsAutoString tagString("table");
PRBool outputMe = aFilter->OutputTag(&tagString);
if (PR_TRUE==outputMe)
{
// Indent
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
// Output the tag and rect
nsIAtom* tag;
mContent->GetTag(tag);
if (tag != nsnull) {
nsAutoString buf;
tag->ToString(buf);
fputs(buf, out);
NS_RELEASE(tag);
}
fprintf(out, "(%d)", ContentIndexInContainer(this));
out << mRect;
if (0 != mState) {
fprintf(out, " [state=%08x]", mState);
}
fputs("\n", out);
if (nsnull!=mTableLayoutStrategy)
{
for (PRInt32 i = aIndent; --i >= 0; ) fputs(" ", out);
fprintf(out, "min=%d, max=%d, fixed=%d, cols=%d, numCols=%d\n",
mTableLayoutStrategy->GetTableMinWidth(),
mTableLayoutStrategy->GetTableMaxWidth(),
mTableLayoutStrategy->GetTableFixedWidth(),
mTableLayoutStrategy->GetCOLSAttribute(),
mTableLayoutStrategy->GetNumCols()
);
}
}
// Output the children
if (mFrames.NotEmpty())
{
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
nsIFrame* child;
for (child = mFrames.FirstChild(); child; child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
for (child = mColGroups.FirstChild(); child;
child->GetNextSibling(child)) {
child->List(out, aIndent + 1, aFilter);
}
}
else
{
if (PR_TRUE==outputMe)
{
if (0 != mState) {
fprintf(out, " [state=%08x]\n", mState);
}
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsTableFrame::GetFrameName(nsString& aResult) const
{

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше