wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 6bedb1e92dd0 due to refcount leaks

Browse Source
This commit is contained in:
Joe Drew 2008-11-07 15:01:35 -05:00
parent 8fd1536f32
commit a2b8f5356f
8 changed files with 19 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsImageLoadingContent.cpp
View File

@ -121,11 +121,11 @@ nsImageLoadingContent::DestroyImageLoadingContent()
{
// Cancel our requests so they won't hold stale refs to us
if (mCurrentRequest) {
mCurrentRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mCurrentRequest->Cancel(NS_ERROR_FAILURE);
mCurrentRequest = nsnull;
}
if (mPendingRequest) {
mPendingRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mPendingRequest->Cancel(NS_ERROR_FAILURE);
mPendingRequest = nsnull;
}
}

6
layout/base/nsImageLoader.cpp
View File

@ -74,7 +74,7 @@ nsImageLoader::~nsImageLoader()
mPresContext = nsnull;
if (mRequest) {
mRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mRequest->Cancel(NS_ERROR_FAILURE);
}
}
@ -95,7 +95,7 @@ nsImageLoader::Destroy()
mPresContext = nsnull;
if (mRequest) {
mRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mRequest->Cancel(NS_ERROR_FAILURE);
}
mRequest = nsnull;
@ -122,7 +122,7 @@ nsImageLoader::Load(imgIRequest *aImage)
}
// Now cancel the old request so it won't hold a stale ref to us.
mRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mRequest->Cancel(NS_ERROR_FAILURE);
mRequest = nsnull;
}

4
layout/generic/nsImageFrame.h
View File

@ -307,11 +307,11 @@ private:
{
// in case the pref service releases us later
if (mLoadingImage) {
mLoadingImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mLoadingImage->Cancel(NS_ERROR_FAILURE);
mLoadingImage = nsnull;
}
if (mBrokenImage) {
mBrokenImage->CancelAndForgetObserver(NS_ERROR_FAILURE);
mBrokenImage->Cancel(NS_ERROR_FAILURE);
mBrokenImage = nsnull;
}
}

2
layout/xul/base/src/nsImageBoxFrame.cpp
View File

@ -207,7 +207,7 @@ nsImageBoxFrame::Destroy()
{
// Release image loader first so that it's refcnt can go to zero
if (mImageRequest)
mImageRequest->CancelAndForgetObserver(NS_ERROR_FAILURE);
mImageRequest->Cancel(NS_ERROR_FAILURE);
if (mListener)
reinterpret_cast<nsImageBoxListener*>(mListener.get())->SetFrame(nsnull); // set the frame to null so we don't send messages to a dead object.

6
modules/libpr0n/public/imgIRequest.idl
View File

@ -104,11 +104,5 @@ interface imgIRequest : nsIRequest
* The principal gotten from the channel the image was loaded from.
*/
readonly attribute nsIPrincipal imagePrincipal;
/**
* Cancels this request as in nsIRequest::Cancel(); further, also nulls out
* decoderObserver so it gets no further notifications from us.
*/
void cancelAndForgetObserver(in nsresult aStatus);
};

44
modules/libpr0n/src/imgRequestProxy.cpp
View File

@ -197,8 +197,6 @@ NS_IMETHODIMP imgRequestProxy::IsPending(PRBool *_retval)
/* readonly attribute nsresult status; */
NS_IMETHODIMP imgRequestProxy::GetStatus(nsresult *aStatus)
{
// XXXbz this is wrong... Canceling with a status should make that
// status the status of the request, generally.
if (!mOwner)
return NS_ERROR_FAILURE;
@ -217,18 +215,13 @@ NS_IMETHODIMP imgRequestProxy::Cancel(nsresult status)
mCanceled = PR_TRUE;
nsCOMPtr<nsIRunnable> ev = new imgCancelRunnable(this, status);
return NS_DispatchToCurrentThread(ev);
}
void
imgRequestProxy::DoCancel(nsresult status)
{
// Passing false to aNotify means that mListener will still get
// OnStopRequest, if needed.
mOwner->RemoveProxy(this, status, PR_FALSE);
NullOutListener();
return NS_OK;
}
/* void suspend (); */
@ -367,21 +360,6 @@ NS_IMETHODIMP imgRequestProxy::GetImagePrincipal(nsIPrincipal **aPrincipal)
return mOwner->GetPrincipal(aPrincipal);
}
/* void cancelAndForgetObserver (in nsresult aStatus); */
NS_IMETHODIMP imgRequestProxy::CancelAndForgetObserver(nsresult aStatus)
{
if (mCanceled || !mOwner)
return NS_ERROR_FAILURE;
LOG_SCOPE(gImgLog, "imgRequestProxy::CancelAndForgetObserver");
nsresult rv = Cancel(aStatus);
NullOutListener();
return rv;
}
/** nsISupportsPriority methods **/
NS_IMETHODIMP imgRequestProxy::GetPriority(PRInt32 *priority)
@ -422,7 +400,7 @@ void imgRequestProxy::FrameChanged(imgIContainer *container, gfxIImageFrame *new
{
LOG_FUNC(gImgLog, "imgRequestProxy::FrameChanged");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->FrameChanged(container, newframe, dirtyRect);
@ -435,7 +413,7 @@ void imgRequestProxy::OnStartDecode()
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStartDecode");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStartDecode(this);
@ -446,7 +424,7 @@ void imgRequestProxy::OnStartContainer(imgIContainer *image)
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStartContainer");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStartContainer(this, image);
@ -457,7 +435,7 @@ void imgRequestProxy::OnStartFrame(gfxIImageFrame *frame)
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStartFrame");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStartFrame(this, frame);
@ -468,7 +446,7 @@ void imgRequestProxy::OnDataAvailable(gfxIImageFrame *frame, const nsIntRect * r
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnDataAvailable");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnDataAvailable(this, frame, rect);
@ -479,7 +457,7 @@ void imgRequestProxy::OnStopFrame(gfxIImageFrame *frame)
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStopFrame");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStopFrame(this, frame);
@ -490,7 +468,7 @@ void imgRequestProxy::OnStopContainer(imgIContainer *image)
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStopContainer");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStopContainer(this, image);
@ -501,7 +479,7 @@ void imgRequestProxy::OnStopDecode(nsresult status, const PRUnichar *statusArg)
{
LOG_FUNC(gImgLog, "imgRequestProxy::OnStopDecode");
if (mListener && !mCanceled) {
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);
mListener->OnStopDecode(this, status, statusArg);
@ -518,8 +496,6 @@ void imgRequestProxy::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
LOG_FUNC_WITH_PARAM(gImgLog, "imgRequestProxy::OnStartRequest", "name", name.get());
#endif
// Notify even if mCanceled, since OnStartRequest is guaranteed by the
// nsIStreamListener contract so it makes sense to do the same here.
if (mListener) {
// Hold a ref to the listener while we call it, just in case.
nsCOMPtr<imgIDecoderObserver> kungFuDeathGrip(mListener);

26
modules/libpr0n/src/imgRequestProxy.h
View File

@ -49,7 +49,6 @@
#include "nsISupportsPriority.h"
#include "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "nsThreadUtils.h"
#include "imgRequest.h"
@ -86,28 +85,6 @@ public:
protected:
friend class imgRequest;
class imgCancelRunnable;
friend class imgCancelRunnable;
class imgCancelRunnable : public nsRunnable
{
public:
imgCancelRunnable(imgRequestProxy* owner, nsresult status)
: mOwner(owner), mStatus(status)
{}
NS_IMETHOD Run() {
mOwner->DoCancel(mStatus);
return NS_OK;
}
private:
nsRefPtr<imgRequestProxy> mOwner;
nsresult mStatus;
};
/* non-virtual imgIDecoderObserver methods */
void OnStartDecode ();
void OnStartContainer(imgIContainer *aContainer);
@ -128,9 +105,6 @@ protected:
return mListener != nsnull;
}
/* Finish up canceling ourselves */
void DoCancel(nsresult status);
/* Do the proper refcount management to null out mListener */
void NullOutListener();

2
widget/src/cocoa/nsMenuItemIconX.mm
View File

@ -98,7 +98,7 @@ nsMenuItemIconX::nsMenuItemIconX(nsMenuObjectX* aMenuItem,
nsMenuItemIconX::~nsMenuItemIconX()
{
if (mIconRequest)
mIconRequest->CancelAndForgetObserver(NS_BINDING_ABORTED);
mIconRequest->Cancel(NS_BINDING_ABORTED);
}