Remove nsIStyleContext (bug 114713), r/sr=dbaron. Changed lots of methods to use nsStyleContext* or already_AddRefed<nsStyleContext> as return values, depending on whether a reference is returned. Turn on nsRefPtr (bug 104346), and change nsDerivedSafe to not declare AddRef and Release explicitly virtual, r=jag, sr=dbaron.
git-svn-id: svn://10.0.0.236/trunk@138129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
#define nsButtonFrameRenderer_h___
|
||||
|
||||
#include "nsCoord.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsFrame.h"
|
||||
|
||||
class nsStyleChangeList;
|
||||
@@ -98,8 +98,8 @@ public:
|
||||
virtual nsMargin GetFullButtonBorderAndPadding();
|
||||
virtual nsMargin GetAddedButtonBorderAndPadding();
|
||||
|
||||
virtual nsresult GetStyleContext(PRInt32 aIndex, nsIStyleContext** aStyleContext) const;
|
||||
virtual nsresult SetStyleContext(PRInt32 aIndex, nsIStyleContext* aStyleContext);
|
||||
virtual nsStyleContext* GetStyleContext(PRInt32 aIndex) const;
|
||||
virtual void SetStyleContext(PRInt32 aIndex, nsStyleContext* aStyleContext);
|
||||
virtual void ReResolveStyles(nsIPresContext* aPresContext);
|
||||
|
||||
virtual void Redraw(nsIPresContext* aPresContext);
|
||||
@@ -111,9 +111,9 @@ protected:
|
||||
private:
|
||||
|
||||
// cached styles for focus and outline.
|
||||
nsCOMPtr<nsIStyleContext> mBorderStyle;
|
||||
nsCOMPtr<nsIStyleContext> mInnerFocusStyle;
|
||||
nsCOMPtr<nsIStyleContext> mOuterFocusStyle;
|
||||
nsRefPtr<nsStyleContext> mBorderStyle;
|
||||
nsRefPtr<nsStyleContext> mInnerFocusStyle;
|
||||
nsRefPtr<nsStyleContext> mOuterFocusStyle;
|
||||
|
||||
nsFrame* mFrame;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user