diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index ab57cbb350f..7f82644d314 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -280,7 +280,15 @@ public: fprintf(out, "@%p", this); } + static void IndentBy(FILE* out, PRInt32 aIndent) { + while (--aIndent >= 0) fputs(" ", out); + } + protected: + // Protected constructor and destructor + nsFrame(); + virtual ~nsFrame(); + virtual void NewContentIsBefore(nsIPresContext& aPresContext, nsIRenderingContext * aRendContext, nsGUIEvent * aEvent, @@ -309,10 +317,6 @@ protected: // Style post processing hook NS_IMETHOD DidSetStyleContext(nsIPresContext* aPresContext); - // Protected constructor and destructor - nsFrame(); - virtual ~nsFrame(); - void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const; /** @@ -326,10 +330,6 @@ protected: */ virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent); - static void IndentBy(FILE* out, PRInt32 aIndent) { - while (--aIndent >= 0) fputs(" ", out); - } - nsresult MakeFrameName(const char* aKind, nsString& aResult) const; static void XMLQuote(nsString& aString); diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index ab57cbb350f..7f82644d314 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -280,7 +280,15 @@ public: fprintf(out, "@%p", this); } + static void IndentBy(FILE* out, PRInt32 aIndent) { + while (--aIndent >= 0) fputs(" ", out); + } + protected: + // Protected constructor and destructor + nsFrame(); + virtual ~nsFrame(); + virtual void NewContentIsBefore(nsIPresContext& aPresContext, nsIRenderingContext * aRendContext, nsGUIEvent * aEvent, @@ -309,10 +317,6 @@ protected: // Style post processing hook NS_IMETHOD DidSetStyleContext(nsIPresContext* aPresContext); - // Protected constructor and destructor - nsFrame(); - virtual ~nsFrame(); - void SizeOfWithoutThis(nsISizeOfHandler* aHandler) const; /** @@ -326,10 +330,6 @@ protected: */ virtual void DumpBaseRegressionData(FILE* out, PRInt32 aIndent); - static void IndentBy(FILE* out, PRInt32 aIndent) { - while (--aIndent >= 0) fputs(" ", out); - } - nsresult MakeFrameName(const char* aKind, nsString& aResult) const; static void XMLQuote(nsString& aString);