mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

changing nsIImageRequest[2] to lpImageRequest

This commit is contained in:
pavlov%netscape.com 2001-02-20 22:55:53 +00:00
Родитель 26cc25a6f1
Коммит bbb4bc3460
6 изменённых файлов: 51 добавлений и 51 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
modules/libpr0n/src/ImageCache.cpp
Просмотреть файл

@ -70,13 +70,13 @@ ImageCache::~ImageCache()
PRBool ImageCache::Put(nsIURI *aKey, nsImageRequest *request)
{
nsIURIKey key(aKey);
return mCache.Put(&key, NS_STATIC_CAST(nsIImageRequest*, request));
return mCache.Put(&key, NS_STATIC_CAST(lpIImageRequest*, request));
}
PRBool ImageCache::Get(nsIURI *aKey, nsImageRequest **request)
{
nsIURIKey key(aKey);
nsImageRequest *sup = NS_REINTERPRET_CAST(nsImageRequest*, NS_STATIC_CAST(nsIImageRequest*, mCache.Get(&key))); // this addrefs
nsImageRequest *sup = NS_REINTERPRET_CAST(nsImageRequest*, NS_STATIC_CAST(lpIImageRequest*, mCache.Get(&key))); // this addrefs
if (sup) {
*request = sup;

18
modules/libpr0n/src/nsImageLoader.cpp
Просмотреть файл

@ -23,7 +23,7 @@
#include "nsImageLoader.h"
#include "nsIImageRequest2.h"
#include "lpIImageRequest.h"
#include "nsIServiceManager.h"
@ -72,8 +72,8 @@ nsImageLoader::~nsImageLoader()
#endif
}
/* nsIImageRequest loadImage (in nsIURI uri, in nsIImageDecoderObserver aObserver, in nsISupports cx); */
NS_IMETHODIMP nsImageLoader::LoadImage(nsIURI *aURI, nsIImageDecoderObserver *aObserver, nsISupports *cx, nsIImageRequest **_retval)
/* lpIImageRequest loadImage (in nsIURI uri, in nsIImageDecoderObserver aObserver, in nsISupports cx); */
NS_IMETHODIMP nsImageLoader::LoadImage(nsIURI *aURI, nsIImageDecoderObserver *aObserver, nsISupports *cx, lpIImageRequest **_retval)
{
NS_ASSERTION(aURI, "nsImageLoader::LoadImage -- NULL URI pointer");
@ -94,7 +94,7 @@ NS_IMETHODIMP nsImageLoader::LoadImage(nsIURI *aURI, nsIImageDecoderObserver *aO
// XXX do we need to SetOwner here?
newChannel->SetOwner(this); // the channel is now holding a strong ref to 'this'
nsCOMPtr<nsIImageRequest> req(do_CreateInstance(kImageRequestCID));
nsCOMPtr<lpIImageRequest> req(do_CreateInstance(kImageRequestCID));
imgRequest = NS_REINTERPRET_CAST(nsImageRequest*, req.get());
NS_ADDREF(imgRequest);
@ -105,7 +105,7 @@ NS_IMETHODIMP nsImageLoader::LoadImage(nsIURI *aURI, nsIImageDecoderObserver *aO
newChannel->AsyncRead(NS_STATIC_CAST(nsIStreamListener *, imgRequest), cx); // XXX are we calling this too early?
}
nsCOMPtr<nsIImageRequest> proxyRequest(do_CreateInstance(kImageRequestProxyCID));
nsCOMPtr<lpIImageRequest> proxyRequest(do_CreateInstance(kImageRequestProxyCID));
// init adds itself to imgRequest's list of observers
NS_REINTERPRET_CAST(nsImageRequestProxy*, proxyRequest.get())->Init(imgRequest, aObserver, cx);
@ -117,8 +117,8 @@ NS_IMETHODIMP nsImageLoader::LoadImage(nsIURI *aURI, nsIImageDecoderObserver *aO
return NS_OK;
}
/* nsIImageRequest loadImageWithChannel(in nsIChannel, in nsIImageDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
NS_IMETHODIMP nsImageLoader::LoadImageWithChannel(nsIChannel *channel, nsIImageDecoderObserver *aObserver, nsISupports *cx, nsIStreamListener **listener, nsIImageRequest **_retval)
/* lpIImageRequest loadImageWithChannel(in nsIChannel, in nsIImageDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
NS_IMETHODIMP nsImageLoader::LoadImageWithChannel(nsIChannel *channel, nsIImageDecoderObserver *aObserver, nsISupports *cx, nsIStreamListener **listener, lpIImageRequest **_retval)
{
NS_ASSERTION(channel, "nsImageLoader::LoadImageWithChannel -- NULL channel pointer");
@ -142,7 +142,7 @@ NS_IMETHODIMP nsImageLoader::LoadImageWithChannel(nsIChannel *channel, nsIImageD
nsAutoLock lock(mLock); // lock when we are adding things to the cache
#endif
nsCOMPtr<nsIImageRequest> req(do_CreateInstance(kImageRequestCID));
nsCOMPtr<lpIImageRequest> req(do_CreateInstance(kImageRequestCID));
imgRequest = NS_REINTERPRET_CAST(nsImageRequest*, req.get());
NS_ADDREF(imgRequest);
@ -155,7 +155,7 @@ NS_IMETHODIMP nsImageLoader::LoadImageWithChannel(nsIChannel *channel, nsIImageD
NS_IF_ADDREF(*listener);
}
nsCOMPtr<nsIImageRequest> proxyRequest(do_CreateInstance(kImageRequestProxyCID));
nsCOMPtr<lpIImageRequest> proxyRequest(do_CreateInstance(kImageRequestProxyCID));
// init adds itself to imgRequest's list of observers
NS_REINTERPRET_CAST(nsImageRequestProxy*, proxyRequest.get())->Init(imgRequest, aObserver, cx);

40
modules/libpr0n/src/nsImageRequest.cpp
Просмотреть файл

@ -38,12 +38,12 @@
#include "ImageCache.h"
NS_IMPL_ISUPPORTS5(nsImageRequest, nsIImageRequest,
NS_IMPL_ISUPPORTS5(nsImageRequest, lpIImageRequest,
nsIImageDecoderObserver, nsIImageContainerObserver,
nsIStreamListener, nsIStreamObserver)
nsImageRequest::nsImageRequest() :
mObservers(0), mProcessing(PR_TRUE), mStatus(nsIImageRequest::STATUS_NONE), mState(0)
mObservers(0), mProcessing(PR_TRUE), mStatus(lpIImageRequest::STATUS_NONE), mState(0)
{
NS_INIT_ISUPPORTS();
/* member initializers and constructor code */
@ -101,7 +101,7 @@ nsresult nsImageRequest::RemoveObserver(nsIImageDecoderObserver *observer, nsres
/** nsIImageRequest methods **/
/** lpIImageRequest methods **/
/* void cancel (in nsresult status); */
@ -152,8 +152,8 @@ NS_IMETHODIMP nsImageRequest::FrameChanged(nsIImageContainer *container, nsISupp
/** nsIImageDecoderObserver methods **/
/* void onStartDecode (in nsIImageRequest request, in nsISupports cx); */
NS_IMETHODIMP nsImageRequest::OnStartDecode(nsIImageRequest *request, nsISupports *cx)
/* void onStartDecode (in lpIImageRequest request, in nsISupports cx); */
NS_IMETHODIMP nsImageRequest::OnStartDecode(lpIImageRequest *request, nsISupports *cx)
{
mState |= onStartDecode;
@ -168,12 +168,12 @@ NS_IMETHODIMP nsImageRequest::OnStartDecode(nsIImageRequest *request, nsISupport
return NS_OK;
}
/* void onStartContainer (in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequest::OnStartContainer(nsIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
/* void onStartContainer (in lpIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequest::OnStartContainer(lpIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
{
mState |= onStartContainer;
mStatus |= nsIImageRequest::STATUS_SIZE_AVAILABLE;
mStatus |= lpIImageRequest::STATUS_SIZE_AVAILABLE;
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@ -186,8 +186,8 @@ NS_IMETHODIMP nsImageRequest::OnStartContainer(nsIImageRequest *request, nsISupp
return NS_OK;
}
/* void onStartFrame (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequest::OnStartFrame(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
/* void onStartFrame (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequest::OnStartFrame(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
{
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@ -200,8 +200,8 @@ NS_IMETHODIMP nsImageRequest::OnStartFrame(nsIImageRequest *request, nsISupports
return NS_OK;
}
/* [noscript] void onDataAvailable (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame, [const] in nsRect rect); */
NS_IMETHODIMP nsImageRequest::OnDataAvailable(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame, const nsRect * rect)
/* [noscript] void onDataAvailable (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame, [const] in nsRect rect); */
NS_IMETHODIMP nsImageRequest::OnDataAvailable(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame, const nsRect * rect)
{
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@ -214,8 +214,8 @@ NS_IMETHODIMP nsImageRequest::OnDataAvailable(nsIImageRequest *request, nsISuppo
return NS_OK;
}
/* void onStopFrame (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequest::OnStopFrame(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
/* void onStopFrame (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequest::OnStopFrame(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
{
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@ -228,8 +228,8 @@ NS_IMETHODIMP nsImageRequest::OnStopFrame(nsIImageRequest *request, nsISupports
return NS_OK;
}
/* void onStopContainer (in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequest::OnStopContainer(nsIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
/* void onStopContainer (in lpIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequest::OnStopContainer(lpIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
{
mState |= onStopContainer;
@ -245,13 +245,13 @@ NS_IMETHODIMP nsImageRequest::OnStopContainer(nsIImageRequest *request, nsISuppo
return NS_OK;
}
/* void onStopDecode (in nsIImageRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
NS_IMETHODIMP nsImageRequest::OnStopDecode(nsIImageRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
/* void onStopDecode (in lpIImageRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
NS_IMETHODIMP nsImageRequest::OnStopDecode(lpIImageRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
{
mState |= onStopDecode;
if (NS_FAILED(status))
mStatus = nsIImageRequest::STATUS_ERROR;
mStatus = lpIImageRequest::STATUS_ERROR;
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@ -294,7 +294,7 @@ NS_IMETHODIMP nsImageRequest::OnStartRequest(nsIChannel *channel, nsISupports *c
return NS_ERROR_FAILURE;
}
mDecoder->Init(NS_STATIC_CAST(nsIImageRequest*, this));
mDecoder->Init(NS_STATIC_CAST(lpIImageRequest*, this));
return NS_OK;
}

4
modules/libpr0n/src/nsImageRequest.h
Просмотреть файл

@ -24,7 +24,7 @@
#ifndef nsImageRequest_h__
#define nsImageRequest_h__
#include "nsIImageRequest2.h"
#include "lpIImageRequest.h"
#include "nsIRunnable.h"
@ -53,7 +53,7 @@ enum {
onStopDecode = 0x8
};
class nsImageRequest : public nsIImageRequest,
class nsImageRequest : public lpIImageRequest,
public nsIImageDecoderObserver,
public nsIStreamListener
{

32
modules/libpr0n/src/nsImageRequestProxy.cpp
Просмотреть файл

@ -40,7 +40,7 @@
#include "nspr.h"
NS_IMPL_ISUPPORTS3(nsImageRequestProxy, nsIImageRequest, nsIImageDecoderObserver, nsIImageContainerObserver)
NS_IMPL_ISUPPORTS3(nsImageRequestProxy, lpIImageRequest, nsIImageDecoderObserver, nsIImageContainerObserver)
nsImageRequestProxy::nsImageRequestProxy()
{
@ -60,7 +60,7 @@ nsresult nsImageRequestProxy::Init(nsImageRequest *request, nsIImageDecoderObser
{
PR_ASSERT(request);
mOwner = NS_STATIC_CAST(nsIImageRequest*, request);
mOwner = NS_STATIC_CAST(lpIImageRequest*, request);
mObserver = aObserver;
// XXX we should save off the thread we are getting called on here so that we can proxy all calls to mDecoder to it.
@ -106,8 +106,8 @@ NS_IMETHODIMP nsImageRequestProxy::FrameChanged(nsIImageContainer *container, ns
/** nsIImageDecoderObserver methods **/
/* void onStartDecode (in nsIImageRequest request, in nsISupports cx); */
NS_IMETHODIMP nsImageRequestProxy::OnStartDecode(nsIImageRequest *request, nsISupports *cx)
/* void onStartDecode (in lpIImageRequest request, in nsISupports cx); */
NS_IMETHODIMP nsImageRequestProxy::OnStartDecode(lpIImageRequest *request, nsISupports *cx)
{
if (mObserver)
mObserver->OnStartDecode(this, mContext);
@ -115,8 +115,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnStartDecode(nsIImageRequest *request, nsISu
return NS_OK;
}
/* void onStartContainer (in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequestProxy::OnStartContainer(nsIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
/* void onStartContainer (in lpIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequestProxy::OnStartContainer(lpIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
{
if (mObserver)
mObserver->OnStartContainer(this, mContext, image);
@ -124,8 +124,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnStartContainer(nsIImageRequest *request, ns
return NS_OK;
}
/* void onStartFrame (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequestProxy::OnStartFrame(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
/* void onStartFrame (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequestProxy::OnStartFrame(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
{
if (mObserver)
mObserver->OnStartFrame(this, mContext, frame);
@ -133,8 +133,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnStartFrame(nsIImageRequest *request, nsISup
return NS_OK;
}
/* [noscript] void onDataAvailable (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame, [const] in nsRect rect); */
NS_IMETHODIMP nsImageRequestProxy::OnDataAvailable(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame, const nsRect * rect)
/* [noscript] void onDataAvailable (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame, [const] in nsRect rect); */
NS_IMETHODIMP nsImageRequestProxy::OnDataAvailable(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame, const nsRect * rect)
{
if (mObserver)
mObserver->OnDataAvailable(this, mContext, frame, rect);
@ -142,8 +142,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnDataAvailable(nsIImageRequest *request, nsI
return NS_OK;
}
/* void onStopFrame (in nsIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequestProxy::OnStopFrame(nsIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
/* void onStopFrame (in lpIImageRequest request, in nsISupports cx, in nsIImageFrame frame); */
NS_IMETHODIMP nsImageRequestProxy::OnStopFrame(lpIImageRequest *request, nsISupports *cx, nsIImageFrame *frame)
{
if (mObserver)
mObserver->OnStopFrame(this, mContext, frame);
@ -151,8 +151,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnStopFrame(nsIImageRequest *request, nsISupp
return NS_OK;
}
/* void onStopContainer (in nsIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequestProxy::OnStopContainer(nsIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
/* void onStopContainer (in lpIImageRequest request, in nsISupports cx, in nsIImageContainer image); */
NS_IMETHODIMP nsImageRequestProxy::OnStopContainer(lpIImageRequest *request, nsISupports *cx, nsIImageContainer *image)
{
if (mObserver)
mObserver->OnStopContainer(this, mContext, image);
@ -160,8 +160,8 @@ NS_IMETHODIMP nsImageRequestProxy::OnStopContainer(nsIImageRequest *request, nsI
return NS_OK;
}
/* void onStopDecode (in nsIImageRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
NS_IMETHODIMP nsImageRequestProxy::OnStopDecode(nsIImageRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
/* void onStopDecode (in lpIImageRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
NS_IMETHODIMP nsImageRequestProxy::OnStopDecode(lpIImageRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
{
if (mObserver)
mObserver->OnStopDecode(this, mContext, status, statusArg);

4
modules/libpr0n/src/nsImageRequestProxy.h
Просмотреть файл

@ -36,7 +36,7 @@
{0x8f, 0x65, 0x9c, 0x46, 0x2e, 0xe2, 0xbc, 0x95} \
}
class nsImageRequestProxy : public nsIImageRequest,
class nsImageRequestProxy : public lpIImageRequest,
public nsIImageDecoderObserver
{
public:
@ -56,5 +56,5 @@ private:
nsCOMPtr<nsISupports> mContext;
nsCOMPtr<nsIImageRequest> mOwner;
nsCOMPtr<lpIImageRequest> mOwner;
};