зеркало из https://github.com/mozilla/pjs.git
s/NS_DECL_NSIIMAGE/NS_DECL_GFXIIMAGE/g
This commit is contained in:
Родитель
566a591c71
Коммит
336addf050
|
@ -45,7 +45,7 @@ class nsImageContainer : public gfxIImageContainer,
|
|||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGECONTAINER
|
||||
NS_DECL_GFXIIMAGECONTAINER
|
||||
NS_DECL_NSPIIMAGECONTAINERGTK
|
||||
|
||||
nsImageContainer();
|
||||
|
|
|
@ -63,7 +63,7 @@ class nsImageFrame : public gfxIImageFrame
|
|||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGEFRAME
|
||||
NS_DECL_GFXIIMAGEFRAME
|
||||
|
||||
nsImageFrame();
|
||||
virtual ~nsImageFrame();
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 2001 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Stuart Parmenter <pavlov@netscape.com>
|
||||
* Chris Saari <saari@netscape.com>
|
||||
*/
|
||||
|
||||
#include "gfxIImageContainer.h"
|
||||
|
||||
#include "gfxIImageContainerObserver.h"
|
||||
|
||||
#include "nsSize.h"
|
||||
|
||||
#include "nsSupportsArray.h"
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsITimer.h"
|
||||
#define NS_IMAGECONTAINER_CID \
|
||||
{ /* aa699204-1dd1-11b2-84a9-a280c268e4fb */ \
|
||||
0xaa699204, \
|
||||
0x1dd1, \
|
||||
0x11b2, \
|
||||
{0x84, 0xa9, 0xa2, 0x80, 0xc2, 0x68, 0xe4, 0xfb} \
|
||||
}
|
||||
|
||||
class nsImageContainer : public gfxIImageContainer
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGECONTAINER
|
||||
|
||||
nsImageContainer();
|
||||
virtual ~nsImageContainer();
|
||||
|
||||
private:
|
||||
/* additional members */
|
||||
nsSupportsArray mFrames;
|
||||
nsSize mSize;
|
||||
PRUint32 mCurrentFrame;
|
||||
PRUint32 mCurrentAnimationFrame;
|
||||
PRBool mCurrentFrameIsFinishedDecoding;
|
||||
PRBool mDoneDecoding;
|
||||
|
||||
nsCOMPtr<nsITimer> mTimer;
|
||||
nsCOMPtr<gfxIImageContainerObserver> mObserver;
|
||||
|
||||
static void sAnimationTimerCallback ( nsITimer* aTimer, void* aListener );
|
||||
};
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 2000-2001 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Stuart Parmenter <pavlov@netscape.com>
|
||||
*/
|
||||
|
||||
#include "gfxIImageFrame.h"
|
||||
|
||||
#include "nsRect.h"
|
||||
|
||||
#define NS_IMAGEFRAME_CID \
|
||||
{ /* 99b219ea-1dd1-11b2-aa87-cd48e7d50227 */ \
|
||||
0x99b219ea, \
|
||||
0x1dd1, \
|
||||
0x11b2, \
|
||||
{0xaa, 0x87, 0xcd, 0x48, 0xe7, 0xd5, 0x02, 0x27} \
|
||||
}
|
||||
|
||||
struct ImageData
|
||||
{
|
||||
ImageData() : bytesPerRow(0), data(nsnull), length(0), depth(0) {}
|
||||
~ImageData() {
|
||||
delete[] data;
|
||||
}
|
||||
PRUint32 bytesPerRow; // bytes per row
|
||||
PRUint8 *data;
|
||||
PRUint32 length; // length of the data in bytes
|
||||
gfx_depth depth;
|
||||
};
|
||||
|
||||
class nsImageFrame : public gfxIImageFrame
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGEFRAME
|
||||
|
||||
nsImageFrame();
|
||||
virtual ~nsImageFrame();
|
||||
|
||||
private:
|
||||
/* additional members */
|
||||
nsRect mRect;
|
||||
|
||||
PRPackedBool mInitalized; // 8 bits
|
||||
// ??? // 8 bits
|
||||
gfx_format mFormat; // 16 bits
|
||||
|
||||
ImageData mImageData;
|
||||
ImageData *mAlphaData;
|
||||
|
||||
PRInt32 mTimeout; // -1 means display forever
|
||||
};
|
|
@ -1,56 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 2001 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Stuart Parmenter <pavlov@netscape.com>
|
||||
*/
|
||||
|
||||
#include "nsIImageContainer.h"
|
||||
#include "nsPIImageContainerXlib.h"
|
||||
|
||||
#include "nsSize.h"
|
||||
|
||||
#include "nsSupportsArray.h"
|
||||
|
||||
#define NS_IMAGECONTAINER_CID \
|
||||
{ /* 284f7652-1dd2-11b2-b0b4-d40aab841150 */ \
|
||||
0x284f7652, \
|
||||
0x1dd2, \
|
||||
0x11b2, \
|
||||
{0xb0, 0xb4, 0xd4, 0x0a, 0xab, 0x84, 0x11, 0x50} \
|
||||
}
|
||||
|
||||
class nsImageContainer : public nsIImageContainer,
|
||||
public nsPIImageContainerXlib
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGECONTAINER
|
||||
NS_DECL_NSPIIMAGECONTAINERXLIB
|
||||
|
||||
nsImageContainer();
|
||||
virtual ~nsImageContainer();
|
||||
|
||||
private:
|
||||
/* additional members */
|
||||
nsSupportsArray mFrames;
|
||||
nsSize mSize;
|
||||
PRUint32 mCurrentFrame;
|
||||
};
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 2000-2001 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Stuart Parmenter <pavlov@netscape.com>
|
||||
*/
|
||||
|
||||
#include "nsIImageFrame.h"
|
||||
|
||||
#include "nsRect.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
#define NS_IMAGEFRAME_CID \
|
||||
{ /* 27d55516-1dd2-11b2-9b33-d9a6328f49bd */ \
|
||||
0x27d55516, \
|
||||
0x1dd2, \
|
||||
0x11b2, \
|
||||
{0x9b, 0x33, 0xd9, 0xa6, 0x32, 0x8f, 0x49, 0xbd} \
|
||||
}
|
||||
|
||||
struct ImageData
|
||||
{
|
||||
ImageData() : bytesPerRow(0), data(nsnull), length(0), depth(0) {}
|
||||
~ImageData() {
|
||||
delete[] data;
|
||||
}
|
||||
PRUint32 bytesPerRow; // bytes per row
|
||||
PRUint8 *data;
|
||||
PRUint32 length; // length of the data in bytes
|
||||
gfx_depth depth;
|
||||
};
|
||||
|
||||
class nsImageFrame : public nsIImageFrame
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIIMAGEFRAME
|
||||
|
||||
nsImageFrame();
|
||||
virtual ~nsImageFrame();
|
||||
|
||||
// nsresult DrawImage(Display * display, Drawable dest, const GC gc, const nsRect * aSrcRect, const nsPoint * aDestPoint);
|
||||
nsresult DrawImage(GdkDrawable *dest, const GdkGC *gc, const nsRect * aSrcRect, const nsPoint * aDestPoint);
|
||||
|
||||
nsresult DrawScaledImage(GdkDrawable *dest, const GdkGC *gc, const nsRect * aSrcRect, const nsRect * aDestRect);
|
||||
|
||||
private:
|
||||
/* additional members */
|
||||
nsRect mRect;
|
||||
|
||||
ImageData mImageData; // ... (ends with 16 bits)
|
||||
gfx_format mFormat; // 16 bits
|
||||
|
||||
ImageData *mAlphaData;
|
||||
|
||||
PRBool mInitalized;
|
||||
};
|
Загрузка…
Ссылка в новой задаче