Bug 370454, make nsISVGValueObserver inherit nsISupportsWeakReference, r=tor, sr=roc

This commit is contained in:
Olli.Pettay%helsinki.fi 2007-02-19 20:03:34 +00:00
parent 62aae02099
commit 8b3f3d0df5
24 changed files with 27 additions and 58 deletions

View File

@ -40,26 +40,18 @@
#ifndef __NS_ISVGVALUEOBSERVER_H__ #ifndef __NS_ISVGVALUEOBSERVER_H__
#define __NS_ISVGVALUEOBSERVER_H__ #define __NS_ISVGVALUEOBSERVER_H__
#include "nsISupports.h" #include "nsWeakReference.h"
class nsISVGValue;
#include "nsISVGValue.h" #include "nsISVGValue.h"
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// nsISVGValueObserver // nsISVGValueObserver
/* // {485029a4-2449-45c1-9814-08f38132ca4c}
Implementors of this interface also need to implement
nsISupportsWeakReference so that svg-values can store safe owning
refs.
*/
// {62fa63b3-d94b-47f3-8dc1-56353a0ee7ff}
#define NS_ISVGVALUEOBSERVER_IID \ #define NS_ISVGVALUEOBSERVER_IID \
{ 0x62fa63b3, 0xd94b, 0x47f3, { 0x8d, 0xc1, 0x56, 0x35, 0x3a, 0xe, 0xe7, 0xff } } { 0x485029a4, 0x2449, 0x45c1, \
{ 0x98, 0x14, 0x08, 0xf3, 0x81, 0x32, 0xca, 0x4c } }
class nsISVGValueObserver : public nsSupportsWeakReference
class nsISVGValueObserver : public nsISupports
{ {
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISVGVALUEOBSERVER_IID) NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISVGVALUEOBSERVER_IID)

View File

@ -53,8 +53,7 @@
class nsSVGAngle : public nsIDOMSVGAngle, class nsSVGAngle : public nsIDOMSVGAngle,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGAngle(nsIDOMSVGAngle** result, friend nsresult NS_NewSVGAngle(nsIDOMSVGAngle** result,

View File

@ -46,8 +46,7 @@
class nsSVGAnimatedAngle : public nsIDOMSVGAnimatedAngle, class nsSVGAnimatedAngle : public nsIDOMSVGAnimatedAngle,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGAnimatedAngle(nsIDOMSVGAnimatedAngle** result, friend nsresult NS_NewSVGAnimatedAngle(nsIDOMSVGAnimatedAngle** result,

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedEnumeration : public nsIDOMSVGAnimatedEnumeration, class nsSVGAnimatedEnumeration : public nsIDOMSVGAnimatedEnumeration,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGAnimatedEnumeration(nsIDOMSVGAnimatedEnumeration** result, friend nsresult NS_NewSVGAnimatedEnumeration(nsIDOMSVGAnimatedEnumeration** result,

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedLengthList : public nsIDOMSVGAnimatedLengthList, class nsSVGAnimatedLengthList : public nsIDOMSVGAnimatedLengthList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult friend nsresult

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedNumberList : public nsIDOMSVGAnimatedNumberList, class nsSVGAnimatedNumberList : public nsIDOMSVGAnimatedNumberList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult friend nsresult

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedPreserveAspectRatio : public nsIDOMSVGAnimatedPreserveAspectRatio, class nsSVGAnimatedPreserveAspectRatio : public nsIDOMSVGAnimatedPreserveAspectRatio,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGAnimatedPreserveAspectRatio( friend nsresult NS_NewSVGAnimatedPreserveAspectRatio(

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedRect : public nsIDOMSVGAnimatedRect, class nsSVGAnimatedRect : public nsIDOMSVGAnimatedRect,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGAnimatedRect(nsIDOMSVGAnimatedRect** result, friend nsresult NS_NewSVGAnimatedRect(nsIDOMSVGAnimatedRect** result,

View File

@ -47,8 +47,7 @@
class nsSVGAnimatedTransformList : public nsIDOMSVGAnimatedTransformList, class nsSVGAnimatedTransformList : public nsIDOMSVGAnimatedTransformList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult friend nsresult

View File

@ -54,8 +54,7 @@
// hide the nsISVGValueObserver interface which we require to listen // hide the nsISVGValueObserver interface which we require to listen
// in on viewbox (mCtxRect) size changes. // in on viewbox (mCtxRect) size changes.
class nsSVGCoordCtxHolder : nsISVGValueObserver, class nsSVGCoordCtxHolder : nsISVGValueObserver
nsSupportsWeakReference
{ {
private: private:
friend class nsSVGCoordCtxProvider; friend class nsSVGCoordCtxProvider;

View File

@ -58,8 +58,7 @@ class nsSVGLength2;
class nsSVGNumber2; class nsSVGNumber2;
class nsSVGElement : public nsGenericElement, // nsIContent class nsSVGElement : public nsGenericElement, // nsIContent
public nsISVGValueObserver, public nsISVGValueObserver // :nsISupportsWeakReference
public nsSupportsWeakReference // :nsISupportsWeakReference
{ {
protected: protected:
nsSVGElement(nsINodeInfo *aNodeInfo); nsSVGElement(nsINodeInfo *aNodeInfo);

View File

@ -55,8 +55,7 @@
class nsSVGLength : public nsISVGLength, class nsSVGLength : public nsISVGLength,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGLength(nsISVGLength** result, friend nsresult NS_NewSVGLength(nsISVGLength** result,

View File

@ -53,8 +53,7 @@
class nsSVGLengthList : public nsISVGLengthList, class nsSVGLengthList : public nsISVGLengthList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGLengthList(nsISVGLengthList** result); friend nsresult NS_NewSVGLengthList(nsISVGLengthList** result);

View File

@ -53,8 +53,7 @@
class nsSVGNumberList : public nsIDOMSVGNumberList, class nsSVGNumberList : public nsIDOMSVGNumberList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGNumberList(nsIDOMSVGNumberList** result); friend nsresult NS_NewSVGNumberList(nsIDOMSVGNumberList** result);

View File

@ -52,8 +52,7 @@
class nsSVGPathSegList : public nsIDOMSVGPathSegList, class nsSVGPathSegList : public nsIDOMSVGPathSegList,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult NS_NewSVGPathSegList(nsIDOMSVGPathSegList** result); friend nsresult NS_NewSVGPathSegList(nsIDOMSVGPathSegList** result);

View File

@ -48,8 +48,7 @@
class nsSVGPointList : public nsSVGValue, class nsSVGPointList : public nsSVGValue,
public nsIDOMSVGPointList, public nsIDOMSVGPointList,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
static nsresult Create(const nsAString& aValue, nsISVGValue** aResult); static nsresult Create(const nsAString& aValue, nsISVGValue** aResult);

View File

@ -57,8 +57,7 @@
class nsSVGStringProxyValue : public nsSVGValue, class nsSVGStringProxyValue : public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
protected: protected:
friend nsresult friend nsresult

View File

@ -54,8 +54,7 @@
class nsSVGTransform : public nsIDOMSVGTransform, class nsSVGTransform : public nsIDOMSVGTransform,
public nsSVGValue, public nsSVGValue,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
static nsresult Create(nsIDOMSVGTransform** aResult); static nsresult Create(nsIDOMSVGTransform** aResult);

View File

@ -47,8 +47,7 @@
class nsSVGTransformList : public nsSVGValue, class nsSVGTransformList : public nsSVGValue,
public nsIDOMSVGTransformList, public nsIDOMSVGTransformList,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
static nsresult Create(nsIDOMSVGTransformList** aResult); static nsresult Create(nsIDOMSVGTransformList** aResult);

View File

@ -53,8 +53,7 @@ typedef nsFrame nsSVGGeometryFrameBase;
* servers. */ * servers. */
class nsSVGGeometryFrame : public nsSVGGeometryFrameBase, class nsSVGGeometryFrame : public nsSVGGeometryFrameBase,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
nsSVGGeometryFrame(nsStyleContext *aContext); nsSVGGeometryFrame(nsStyleContext *aContext);

View File

@ -51,8 +51,7 @@ class nsIDOMSVGStopElement;
typedef nsSVGPaintServerFrame nsSVGGradientFrameBase; typedef nsSVGPaintServerFrame nsSVGGradientFrameBase;
class nsSVGGradientFrame : public nsSVGGradientFrameBase, class nsSVGGradientFrame : public nsSVGGradientFrameBase,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
// nsSVGPaintServerFrame methods: // nsSVGPaintServerFrame methods:

View File

@ -50,7 +50,6 @@ typedef nsSVGDisplayContainerFrame nsSVGInnerSVGFrameBase;
class nsSVGInnerSVGFrame : public nsSVGInnerSVGFrameBase, class nsSVGInnerSVGFrame : public nsSVGInnerSVGFrameBase,
public nsISVGValueObserver, public nsISVGValueObserver,
public nsSupportsWeakReference,
public nsISVGSVGFrame public nsISVGSVGFrame
{ {
friend nsIFrame* friend nsIFrame*

View File

@ -54,8 +54,7 @@ class gfxContext;
typedef nsSVGPaintServerFrame nsSVGPatternFrameBase; typedef nsSVGPaintServerFrame nsSVGPatternFrameBase;
class nsSVGPatternFrame : public nsSVGPatternFrameBase, class nsSVGPatternFrame : public nsSVGPatternFrameBase,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
friend nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell, friend nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell,

View File

@ -50,8 +50,7 @@ class nsSVGFlattenedPath;
typedef nsSVGTSpanFrame nsSVGTextPathFrameBase; typedef nsSVGTSpanFrame nsSVGTextPathFrameBase;
class nsSVGTextPathFrame : public nsSVGTextPathFrameBase, class nsSVGTextPathFrame : public nsSVGTextPathFrameBase,
public nsISVGValueObserver, public nsISVGValueObserver
public nsSupportsWeakReference
{ {
public: public:
nsSVGTextPathFrame(nsStyleContext* aContext) : nsSVGTextPathFrameBase(aContext) {} nsSVGTextPathFrame(nsStyleContext* aContext) : nsSVGTextPathFrameBase(aContext) {}