From 1c7f8e98ea79fb2c4fa5300f3dc04de2a47333cf Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Thu, 9 Jan 2003 08:07:27 +0000 Subject: [PATCH] Make GetStyleDataExternal |const| to fix build bustage. git-svn-id: svn://10.0.0.236/trunk@136060 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/public/nsIFrame.h | 4 ++-- mozilla/layout/generic/nsFrame.cpp | 2 +- mozilla/layout/generic/nsFrame.h | 2 +- mozilla/layout/generic/nsIFrame.h | 4 ++-- mozilla/layout/html/base/src/nsFrame.cpp | 2 +- mozilla/layout/html/base/src/nsFrame.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 749353c805f..dc08f38859d 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -580,7 +580,7 @@ public: * Get the style data associated with this frame. */ NS_IMETHOD GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) = 0; + const nsStyleStruct*& aStyleStruct) const = 0; #ifdef _IMPL_NS_LAYOUT nsresult GetStyleData(nsStyleStructID aSID, @@ -591,7 +591,7 @@ public: } #else nsresult GetStyleData(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) { + const nsStyleStruct*& aStyleStruct) const { return GetStyleDataExternal(aSID, aStyleStruct); } #endif diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index b32a0688afd..d43f8152e96 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -4716,7 +4716,7 @@ nsFrame::GetProperty(nsIPresContext* aPresContext, NS_IMETHODIMP nsFrame::GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) + const nsStyleStruct*& aStyleStruct) const { if (!mStyleContext) { aStyleStruct = nsnull; diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 9c7b32a4bc5..69579b87143 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -398,7 +398,7 @@ public: NSFramePropertyDtorFunc aPropDtorFunc); NS_IMETHOD GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct); + const nsStyleStruct*& aStyleStruct) const; #ifdef IBMBIDI NS_IMETHOD GetBidiProperty(nsIPresContext* aPresContext, diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 749353c805f..dc08f38859d 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -580,7 +580,7 @@ public: * Get the style data associated with this frame. */ NS_IMETHOD GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) = 0; + const nsStyleStruct*& aStyleStruct) const = 0; #ifdef _IMPL_NS_LAYOUT nsresult GetStyleData(nsStyleStructID aSID, @@ -591,7 +591,7 @@ public: } #else nsresult GetStyleData(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) { + const nsStyleStruct*& aStyleStruct) const { return GetStyleDataExternal(aSID, aStyleStruct); } #endif diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index b32a0688afd..d43f8152e96 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -4716,7 +4716,7 @@ nsFrame::GetProperty(nsIPresContext* aPresContext, NS_IMETHODIMP nsFrame::GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct) + const nsStyleStruct*& aStyleStruct) const { if (!mStyleContext) { aStyleStruct = nsnull; diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 9c7b32a4bc5..69579b87143 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -398,7 +398,7 @@ public: NSFramePropertyDtorFunc aPropDtorFunc); NS_IMETHOD GetStyleDataExternal(nsStyleStructID aSID, - const nsStyleStruct*& aStyleStruct); + const nsStyleStruct*& aStyleStruct) const; #ifdef IBMBIDI NS_IMETHOD GetBidiProperty(nsIPresContext* aPresContext,