From ddb2f11c7f4c50ef151e985b30ea18d49edf815c Mon Sep 17 00:00:00 2001 From: peterl Date: Fri, 5 Jun 1998 05:59:34 +0000 Subject: [PATCH] changed GetStyleData to return const pointers to style structs new method GetMutableStyleData to get non-const pointer git-svn-id: svn://10.0.0.236/trunk@3317 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/public/nsIFrame.h | 2 +- mozilla/layout/base/public/nsIStyleContext.h | 8 +++++++- mozilla/layout/generic/nsIFrame.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 19565b8c366..26bcbc868db 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -250,7 +250,7 @@ public: /** * Get the style data associated with this frame */ - NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const = 0; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const = 0; /** * Accessor functions for geometric and content parent. diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h index 63fa29f91af..d7c1b547f1a 100644 --- a/mozilla/layout/base/public/nsIStyleContext.h +++ b/mozilla/layout/base/public/nsIStyleContext.h @@ -180,7 +180,13 @@ public: virtual nsIStyleContext* FindChildWithRules(nsISupportsArray* aRules) = 0; // get a style data struct by ID, may return null - virtual nsStyleStruct* GetData(nsStyleStructID aSID) = 0; + virtual const nsStyleStruct* GetStyleData(nsStyleStructID aSID) = 0; + + // get a style data struct by ID, may return null + virtual nsStyleStruct* GetMutableStyleData(nsStyleStructID aSID) = 0; + + // call this to prevent context from getting shared + virtual void ForceUnique(void) = 0; // call if you change style data after creation virtual void RecalcAutomaticData(nsIPresContext* aPresContext) = 0; diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 19565b8c366..26bcbc868db 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -250,7 +250,7 @@ public: /** * Get the style data associated with this frame */ - NS_IMETHOD GetStyleData(nsStyleStructID aSID, nsStyleStruct*& aStyleStruct) const = 0; + NS_IMETHOD GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const = 0; /** * Accessor functions for geometric and content parent.