Bug 611797 part 1: Expand NS_DECL_IMGICONTAINER in RasterImage & VectorImage. r+a=joe

This commit is contained in:
Daniel Holbert 2010-11-17 12:37:08 -08:00
parent f9eb99961a
commit d54a0c55a5
2 changed files with 40 additions and 2 deletions

View File

@ -158,13 +158,32 @@ class RasterImage : public mozilla::imagelib::Image
{
public:
NS_DECL_ISUPPORTS
NS_DECL_IMGICONTAINER
NS_DECL_NSITIMERCALLBACK
NS_DECL_NSIPROPERTIES
#ifdef DEBUG
NS_DECL_IMGICONTAINERDEBUG
#endif
// BEGIN NS_DECL_IMGICONTAINER
// ** Don't edit this chunk except to mirror changes in imgIContainer.idl **
NS_SCRIPTABLE NS_IMETHOD GetWidth(PRInt32 *aWidth);
NS_SCRIPTABLE NS_IMETHOD GetHeight(PRInt32 *aHeight);
NS_SCRIPTABLE NS_IMETHOD GetType(PRUint16 *aType);
NS_SCRIPTABLE NS_IMETHOD GetAnimated(PRBool *aAnimated);
NS_SCRIPTABLE NS_IMETHOD GetCurrentFrameIsOpaque(PRBool *aCurrentFrameIsOpaque);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval NS_OUTPARAM);
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval NS_OUTPARAM);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval NS_OUTPARAM);
NS_IMETHOD Draw(gfxContext *aContext, gfxPattern::GraphicsFilter aFilter, const gfxMatrix & aUserSpaceToImageSpace, const gfxRect & aFill, const nsIntRect & aSubimage, const nsIntSize & aViewportSize, PRUint32 aFlags);
NS_IMETHOD_(nsIFrame *) GetRootLayoutFrame(void);
NS_SCRIPTABLE NS_IMETHOD RequestDecode(void);
NS_SCRIPTABLE NS_IMETHOD LockImage(void);
NS_SCRIPTABLE NS_IMETHOD UnlockImage(void);
NS_SCRIPTABLE NS_IMETHOD GetAnimationMode(PRUint16 *aAnimationMode);
NS_SCRIPTABLE NS_IMETHOD SetAnimationMode(PRUint16 aAnimationMode);
NS_SCRIPTABLE NS_IMETHOD ResetAnimation(void);
// END NS_DECL_IMGICONTAINER
RasterImage(imgStatusTracker* aStatusTracker = nsnull);
virtual ~RasterImage();

View File

@ -56,10 +56,29 @@ class VectorImage : public Image,
{
public:
NS_DECL_ISUPPORTS
NS_DECL_IMGICONTAINER
NS_DECL_NSIREQUESTOBSERVER
NS_DECL_NSISTREAMLISTENER
// BEGIN NS_DECL_IMGICONTAINER
// ** Don't edit this chunk except to mirror changes in imgIContainer.idl **
NS_SCRIPTABLE NS_IMETHOD GetWidth(PRInt32 *aWidth);
NS_SCRIPTABLE NS_IMETHOD GetHeight(PRInt32 *aHeight);
NS_SCRIPTABLE NS_IMETHOD GetType(PRUint16 *aType);
NS_SCRIPTABLE NS_IMETHOD GetAnimated(PRBool *aAnimated);
NS_SCRIPTABLE NS_IMETHOD GetCurrentFrameIsOpaque(PRBool *aCurrentFrameIsOpaque);
NS_IMETHOD GetFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxASurface **_retval NS_OUTPARAM);
NS_IMETHOD CopyFrame(PRUint32 aWhichFrame, PRUint32 aFlags, gfxImageSurface **_retval NS_OUTPARAM);
NS_IMETHOD ExtractFrame(PRUint32 aWhichFrame, const nsIntRect & aRect, PRUint32 aFlags, imgIContainer **_retval NS_OUTPARAM);
NS_IMETHOD Draw(gfxContext *aContext, gfxPattern::GraphicsFilter aFilter, const gfxMatrix & aUserSpaceToImageSpace, const gfxRect & aFill, const nsIntRect & aSubimage, const nsIntSize & aViewportSize, PRUint32 aFlags);
NS_IMETHOD_(nsIFrame *) GetRootLayoutFrame(void);
NS_SCRIPTABLE NS_IMETHOD RequestDecode(void);
NS_SCRIPTABLE NS_IMETHOD LockImage(void);
NS_SCRIPTABLE NS_IMETHOD UnlockImage(void);
NS_SCRIPTABLE NS_IMETHOD GetAnimationMode(PRUint16 *aAnimationMode);
NS_SCRIPTABLE NS_IMETHOD SetAnimationMode(PRUint16 aAnimationMode);
NS_SCRIPTABLE NS_IMETHOD ResetAnimation(void);
// END NS_DECL_IMGICONTAINER
VectorImage(imgStatusTracker* aStatusTracker = nsnull);
virtual ~VectorImage();