diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h index 5fe330b8d8f..bb140626cd3 100644 --- a/mozilla/content/base/public/nsIContent.h +++ b/mozilla/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. */ diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index e2e54e789a8..51fee5b56f9 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/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; -} - diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h index 52ccd0e7a00..b688f83cd2b 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.h +++ b/mozilla/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, \ diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index f4d5236623b..163d9617488 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/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 { diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h index 91ada0fcaea..4edd52fa000 100644 --- a/mozilla/content/base/src/nsGenericElement.h +++ b/mozilla/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, \ diff --git a/mozilla/content/base/src/nsHTMLValue.cpp b/mozilla/content/base/src/nsHTMLValue.cpp index 0364d99b2d1..9f575096904 100644 --- a/mozilla/content/base/src/nsHTMLValue.cpp +++ b/mozilla/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); - } - } -} diff --git a/mozilla/content/base/src/nsHTMLValue.h b/mozilla/content/base/src/nsHTMLValue.h index 2dde5c9a024..ce946a578e9 100644 --- a/mozilla/content/base/src/nsHTMLValue.h +++ b/mozilla/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; diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 1138814cd7f..f59fcbe1fc5 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/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 { diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h index 6288bccdb82..02972e377c1 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.h +++ b/mozilla/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; diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp index 85c9ddae057..cc42477cde5 100644 --- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/mozilla/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); diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp index d33f6c1ae8f..5e65c8b96b6 100644 --- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/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 { diff --git a/mozilla/content/html/style/src/nsHTMLValue.cpp b/mozilla/content/html/style/src/nsHTMLValue.cpp index 0364d99b2d1..9f575096904 100644 --- a/mozilla/content/html/style/src/nsHTMLValue.cpp +++ b/mozilla/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); - } - } -} diff --git a/mozilla/content/html/style/src/nsHTMLValue.h b/mozilla/content/html/style/src/nsHTMLValue.h index 2dde5c9a024..ce946a578e9 100644 --- a/mozilla/content/html/style/src/nsHTMLValue.h +++ b/mozilla/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; diff --git a/mozilla/content/html/style/src/nsIHTMLAttributes.h b/mozilla/content/html/style/src/nsIHTMLAttributes.h index 983113c15a1..19c00447d70 100644 --- a/mozilla/content/html/style/src/nsIHTMLAttributes.h +++ b/mozilla/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; }; diff --git a/mozilla/content/shared/public/nsHTMLValue.h b/mozilla/content/shared/public/nsHTMLValue.h index 2dde5c9a024..ce946a578e9 100644 --- a/mozilla/content/shared/public/nsHTMLValue.h +++ b/mozilla/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; diff --git a/mozilla/content/shared/src/nsHTMLValue.cpp b/mozilla/content/shared/src/nsHTMLValue.cpp index 0364d99b2d1..9f575096904 100644 --- a/mozilla/content/shared/src/nsHTMLValue.cpp +++ b/mozilla/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); - } - } -} diff --git a/mozilla/content/xml/content/src/nsXMLElement.h b/mozilla/content/xml/content/src/nsXMLElement.h index b14a62be925..56327c8465f 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.h +++ b/mozilla/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, diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index dc9169cb67d..1fae80c57a4 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/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); } } diff --git a/mozilla/layout/base/public/nsIContent.h b/mozilla/layout/base/public/nsIContent.h index 5fe330b8d8f..bb140626cd3 100644 --- a/mozilla/layout/base/public/nsIContent.h +++ b/mozilla/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. */ diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 68c1903e54c..ea1fff1683c 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/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 not 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___ */ diff --git a/mozilla/layout/base/public/nsIFrameImageLoader.h b/mozilla/layout/base/public/nsIFrameImageLoader.h index 816de0a4dcd..62dce9347fa 100644 --- a/mozilla/layout/base/public/nsIFrameImageLoader.h +++ b/mozilla/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 diff --git a/mozilla/layout/base/src/nsDocumentFragment.h b/mozilla/layout/base/src/nsDocumentFragment.h index 38da6f72a3a..25090712983 100644 --- a/mozilla/layout/base/src/nsDocumentFragment.h +++ b/mozilla/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, diff --git a/mozilla/layout/base/src/nsFrameImageLoader.cpp b/mozilla/layout/base/src/nsFrameImageLoader.cpp index 3252e9bb373..1cdaca1994d 100644 --- a/mozilla/layout/base/src/nsFrameImageLoader.cpp +++ b/mozilla/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; -} diff --git a/mozilla/layout/base/src/nsFrameImageLoader.h b/mozilla/layout/base/src/nsFrameImageLoader.h index 1f5795fa689..7976291afa4 100644 --- a/mozilla/layout/base/src/nsFrameImageLoader.h +++ b/mozilla/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(); diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp index e2e54e789a8..51fee5b56f9 100644 --- a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/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; -} - diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.h b/mozilla/layout/base/src/nsGenericDOMDataNode.h index 52ccd0e7a00..b688f83cd2b 100644 --- a/mozilla/layout/base/src/nsGenericDOMDataNode.h +++ b/mozilla/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, \ diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp index f4d5236623b..163d9617488 100644 --- a/mozilla/layout/base/src/nsGenericElement.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/base/src/nsGenericElement.h b/mozilla/layout/base/src/nsGenericElement.h index 91ada0fcaea..4edd52fa000 100644 --- a/mozilla/layout/base/src/nsGenericElement.h +++ b/mozilla/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, \ diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp index a6126898cc7..5da9e22fba6 100644 --- a/mozilla/layout/generic/nsAreaFrame.cpp +++ b/mozilla/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); } diff --git a/mozilla/layout/generic/nsAreaFrame.h b/mozilla/layout/generic/nsAreaFrame.h index 4ffd090af4b..cb3ad3b0b82 100644 --- a/mozilla/layout/generic/nsAreaFrame.h +++ b/mozilla/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: diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/generic/nsBlockFrame.h b/mozilla/layout/generic/nsBlockFrame.h index 997bb813ca3..2667259ce42 100644 --- a/mozilla/layout/generic/nsBlockFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/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; } diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp index bee2a986601..d45b3efc8ab 100644 --- a/mozilla/layout/generic/nsBulletFrame.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/generic/nsBulletFrame.h b/mozilla/layout/generic/nsBulletFrame.h index 7ef2a6b236a..f68decd0b25 100644 --- a/mozilla/layout/generic/nsBulletFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index b9ab9daa6cc..8ca4d935b32 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/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; diff --git a/mozilla/layout/generic/nsContainerFrame.h b/mozilla/layout/generic/nsContainerFrame.h index 78d9f6c992f..ff70a394e20 100644 --- a/mozilla/layout/generic/nsContainerFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 6af7e21207e..1144469e6ec 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 467d85ff115..6f4f71cdcc0 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/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 diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 43aecdc1221..d85a7bbeaa3 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/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); } diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 68c1903e54c..ea1fff1683c 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/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 not 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___ */ diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 50ab2970bd3..381288c8185 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/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) diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp index 28fbc786901..b5a56ec59a1 100644 --- a/mozilla/layout/generic/nsLineBox.cpp +++ b/mozilla/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* diff --git a/mozilla/layout/generic/nsLineBox.h b/mozilla/layout/generic/nsLineBox.h index a6aaaf53155..e0d3917c81c 100644 --- a/mozilla/layout/generic/nsLineBox.h +++ b/mozilla/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); diff --git a/mozilla/layout/generic/nsSplittableFrame.cpp b/mozilla/layout/generic/nsSplittableFrame.cpp index ad680e73fd1..fed7c91c974 100644 --- a/mozilla/layout/generic/nsSplittableFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/generic/nsSplittableFrame.h b/mozilla/layout/generic/nsSplittableFrame.h index 11b0163cc7e..68dd0315064 100644 --- a/mozilla/layout/generic/nsSplittableFrame.h +++ b/mozilla/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; diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 0b64c5ba5d0..f8804afbe54 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/html/base/src/nsAreaFrame.cpp b/mozilla/layout/html/base/src/nsAreaFrame.cpp index a6126898cc7..5da9e22fba6 100644 --- a/mozilla/layout/html/base/src/nsAreaFrame.cpp +++ b/mozilla/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); } diff --git a/mozilla/layout/html/base/src/nsAreaFrame.h b/mozilla/layout/html/base/src/nsAreaFrame.h index 4ffd090af4b..cb3ad3b0b82 100644 --- a/mozilla/layout/html/base/src/nsAreaFrame.h +++ b/mozilla/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: diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.h b/mozilla/layout/html/base/src/nsBlockFrame.h index 997bb813ca3..2667259ce42 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index 93034aef62e..945813614b4 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/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; } diff --git a/mozilla/layout/html/base/src/nsBodyFrame.h b/mozilla/layout/html/base/src/nsBodyFrame.h index c01219d4b3a..e03c8994b35 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.h +++ b/mozilla/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: diff --git a/mozilla/layout/html/base/src/nsBulletFrame.cpp b/mozilla/layout/html/base/src/nsBulletFrame.cpp index bee2a986601..d45b3efc8ab 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/html/base/src/nsBulletFrame.h b/mozilla/layout/html/base/src/nsBulletFrame.h index 7ef2a6b236a..f68decd0b25 100644 --- a/mozilla/layout/html/base/src/nsBulletFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index b9ab9daa6cc..8ca4d935b32 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/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; diff --git a/mozilla/layout/html/base/src/nsContainerFrame.h b/mozilla/layout/html/base/src/nsContainerFrame.h index 78d9f6c992f..ff70a394e20 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.h +++ b/mozilla/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, diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 6af7e21207e..1144469e6ec 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/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; } diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 467d85ff115..6f4f71cdcc0 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/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 diff --git a/mozilla/layout/html/base/src/nsHTMLImage.h b/mozilla/layout/html/base/src/nsHTMLImage.h index f48f01c4e7a..4e4ae4e086d 100644 --- a/mozilla/layout/html/base/src/nsHTMLImage.h +++ b/mozilla/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, diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 50ab2970bd3..381288c8185 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/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) diff --git a/mozilla/layout/html/base/src/nsLineBox.cpp b/mozilla/layout/html/base/src/nsLineBox.cpp index 28fbc786901..b5a56ec59a1 100644 --- a/mozilla/layout/html/base/src/nsLineBox.cpp +++ b/mozilla/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* diff --git a/mozilla/layout/html/base/src/nsLineBox.h b/mozilla/layout/html/base/src/nsLineBox.h index a6aaaf53155..e0d3917c81c 100644 --- a/mozilla/layout/html/base/src/nsLineBox.h +++ b/mozilla/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); diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index dc9169cb67d..1fae80c57a4 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/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); } } diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.cpp b/mozilla/layout/html/base/src/nsSplittableFrame.cpp index ad680e73fd1..fed7c91c974 100644 --- a/mozilla/layout/html/base/src/nsSplittableFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.h b/mozilla/layout/html/base/src/nsSplittableFrame.h index 11b0163cc7e..68dd0315064 100644 --- a/mozilla/layout/html/base/src/nsSplittableFrame.h +++ b/mozilla/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; diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 0b64c5ba5d0..f8804afbe54 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp index 1138814cd7f..f59fcbe1fc5 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.h b/mozilla/layout/html/content/src/nsGenericHTMLElement.h index 6288bccdb82..02972e377c1 100644 --- a/mozilla/layout/html/content/src/nsGenericHTMLElement.h +++ b/mozilla/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; diff --git a/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp index 85c9ddae057..cc42477cde5 100644 --- a/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index 43aecdc1221..d85a7bbeaa3 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/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); } diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css index b11b843e64f..425dc719157 100644 --- a/mozilla/layout/html/document/src/ua.css +++ b/mozilla/layout/html/document/src/ua.css @@ -495,7 +495,7 @@ NOFRAMES { /* Pseudo-element style */ -:IB-PSEUDO { +:MOZ-ANONYMOUS-BLOCK { display: block; } diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp index d33f6c1ae8f..5e65c8b96b6 100644 --- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/style/src/nsHTMLValue.cpp b/mozilla/layout/html/style/src/nsHTMLValue.cpp index 0364d99b2d1..9f575096904 100644 --- a/mozilla/layout/html/style/src/nsHTMLValue.cpp +++ b/mozilla/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); - } - } -} diff --git a/mozilla/layout/html/style/src/nsHTMLValue.h b/mozilla/layout/html/style/src/nsHTMLValue.h index 2dde5c9a024..ce946a578e9 100644 --- a/mozilla/layout/html/style/src/nsHTMLValue.h +++ b/mozilla/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; diff --git a/mozilla/layout/html/style/src/nsIHTMLAttributes.h b/mozilla/layout/html/style/src/nsIHTMLAttributes.h index 983113c15a1..19c00447d70 100644 --- a/mozilla/layout/html/style/src/nsIHTMLAttributes.h +++ b/mozilla/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; }; diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index 90624c9e1bb..f6ebec0799b 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.h b/mozilla/layout/html/table/src/nsTableCellFrame.h index 2e48b46c737..81feb4c690e 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.h +++ b/mozilla/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 diff --git a/mozilla/layout/html/table/src/nsTableColFrame.cpp b/mozilla/layout/html/table/src/nsTableColFrame.cpp index 6dc7a633a25..8b0350ba3c4 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableColFrame.h b/mozilla/layout/html/table/src/nsTableColFrame.h index a2abcd9b423..22a2b7f2766 100644 --- a/mozilla/layout/html/table/src/nsTableColFrame.h +++ b/mozilla/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(); diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index 43cf71d09ce..01594606bb1 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.h b/mozilla/layout/html/table/src/nsTableColGroupFrame.h index 285dab9b036..0782ae937a5 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.h +++ b/mozilla/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 */ diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 0de41792bee..0d92d853310 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableFrame.h b/mozilla/layout/html/table/src/nsTableFrame.h index a95ffb2bc58..2e3d46ceb60 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.h +++ b/mozilla/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. diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index d7e13ef263b..79e00e92dd1 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.h b/mozilla/layout/html/table/src/nsTableOuterFrame.h index 95b7ef72a04..4762bfc66ff 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.h +++ b/mozilla/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: diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 9b27597c5a0..ad63c6bfbe5 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.h b/mozilla/layout/html/table/src/nsTableRowFrame.h index 31ad26f8a60..211b54ff71a 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.h +++ b/mozilla/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. diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index f3628c52d5f..4b594ef71a9 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.h b/mozilla/layout/html/table/src/nsTableRowGroupFrame.h index ffc951c4922..aa7b5f8cee6 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.h +++ b/mozilla/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 */ diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css index b11b843e64f..425dc719157 100644 --- a/mozilla/layout/style/ua.css +++ b/mozilla/layout/style/ua.css @@ -495,7 +495,7 @@ NOFRAMES { /* Pseudo-element style */ -:IB-PSEUDO { +:MOZ-ANONYMOUS-BLOCK { display: block; } diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 90624c9e1bb..f6ebec0799b 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index 2e48b46c737..81feb4c690e 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/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 diff --git a/mozilla/layout/tables/nsTableColFrame.cpp b/mozilla/layout/tables/nsTableColFrame.cpp index 6dc7a633a25..8b0350ba3c4 100644 --- a/mozilla/layout/tables/nsTableColFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/tables/nsTableColFrame.h b/mozilla/layout/tables/nsTableColFrame.h index a2abcd9b423..22a2b7f2766 100644 --- a/mozilla/layout/tables/nsTableColFrame.h +++ b/mozilla/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(); diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index 43cf71d09ce..01594606bb1 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/tables/nsTableColGroupFrame.h b/mozilla/layout/tables/nsTableColGroupFrame.h index 285dab9b036..0782ae937a5 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.h +++ b/mozilla/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 */ diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 0de41792bee..0d92d853310 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/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 { diff --git a/mozilla/layout/tables/nsTableFrame.h b/mozilla/layout/tables/nsTableFrame.h index a95ffb2bc58..2e3d46ceb60 100644 --- a/mozilla/layout/tables/nsTableFrame.h +++ b/mozilla/layout/tables/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. diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index d7e13ef263b..79e00e92dd1 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/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 { diff --git a/mozilla/layout/tables/nsTableOuterFrame.h b/mozilla/layout/tables/nsTableOuterFrame.h index 95b7ef72a04..4762bfc66ff 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.h +++ b/mozilla/layout/tables/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: diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 9b27597c5a0..ad63c6bfbe5 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/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 { diff --git a/mozilla/layout/tables/nsTableRowFrame.h b/mozilla/layout/tables/nsTableRowFrame.h index 31ad26f8a60..211b54ff71a 100644 --- a/mozilla/layout/tables/nsTableRowFrame.h +++ b/mozilla/layout/tables/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. diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index f3628c52d5f..4b594ef71a9 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/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 { diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.h b/mozilla/layout/tables/nsTableRowGroupFrame.h index ffc951c4922..aa7b5f8cee6 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.h +++ b/mozilla/layout/tables/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 */ diff --git a/mozilla/layout/xml/content/src/nsXMLElement.h b/mozilla/layout/xml/content/src/nsXMLElement.h index b14a62be925..56327c8465f 100644 --- a/mozilla/layout/xml/content/src/nsXMLElement.h +++ b/mozilla/layout/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,