Back out 134f5b1d6d50 for leaking at shutdown on a CLOSED TREE

This commit is contained in:
Joe Drew 2012-10-03 16:31:28 -04:00
parent c500015d76
commit b610b33b73
2 changed files with 2 additions and 12 deletions

View File

@ -234,8 +234,8 @@ RasterImage::RasterImage(imgStatusTracker* aStatusTracker) :
mInDecoder(false),
mAnimationFinished(false),
mFinishing(false),
mInUpdateImageContainer(false),
mScaleRequest(this)
mScaleRequest(this),
mInUpdateImageContainer(false)
{
// Set up the discard tracker node.
mDiscardTrackerNode.img = this;
@ -2714,10 +2714,6 @@ RasterImage::ScaleWorker::RequestScale(RasterImage* aImg)
if (request->isInList())
return;
// While the request is outstanding, we hold a reference to it so it won't be
// deleted from under us (and, since it owns us, so we won't be deleted).
request->kungFuDeathGrip = request->image;
mScaleRequests.insertBack(request);
if (!sScaleWorkerThread) {
@ -2762,11 +2758,6 @@ RasterImage::DrawWorker::Run()
nsIntRect frameRect = request->srcFrame->GetRect();
observer->FrameChanged(nullptr, request->image, &frameRect);
}
if (request->done) {
// We are now done with this image, so we can release our reference.
// THIS CAN DELETE THE REQUEST!
request->kungFuDeathGrip = nullptr;
}
}
return NS_OK;

View File

@ -511,7 +511,6 @@ private:
static void Stop(RasterImage* aImg);
RasterImage* const image;
nsRefPtr<RasterImage> kungFuDeathGrip;
imgFrame *srcFrame;
nsAutoPtr<imgFrame> dstFrame;
gfxSize scale;