diff --git a/mozilla/extensions/inspector/base/src/inBitmapDecoder.cpp b/mozilla/extensions/inspector/base/src/inBitmapDecoder.cpp index 04d3118876e..8e87d3594de 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapDecoder.cpp +++ b/mozilla/extensions/inspector/base/src/inBitmapDecoder.cpp @@ -50,14 +50,13 @@ inBitmapDecoder::~inBitmapDecoder() /** imgIDecoder methods **/ -NS_IMETHODIMP inBitmapDecoder::Init(imgIRequest *aRequest) +NS_IMETHODIMP inBitmapDecoder::Init(imgILoad *aLoad) { - mRequest = aRequest; - - mObserver = do_QueryInterface(aRequest); // we're holding 2 strong refs to the request. + mObserver = do_QueryInterface(aRequest); mImage = do_CreateInstance("@mozilla.org/image/container;1"); - aRequest->SetImage(mImage); + if (!mImage) return NS_ERROR_FAILURE; + aLoad->SetImage(mImage); mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2"); if (!mFrame) return NS_ERROR_FAILURE; diff --git a/mozilla/extensions/inspector/base/src/inBitmapDecoder.h b/mozilla/extensions/inspector/base/src/inBitmapDecoder.h index 6d42f131ddf..94b9c7b4b69 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapDecoder.h +++ b/mozilla/extensions/inspector/base/src/inBitmapDecoder.h @@ -30,7 +30,7 @@ #include "imgIContainer.h" #include "imgIDecoderObserver.h" #include "gfxIImageFrame.h" -#include "imgIRequest.h" +#include "imgILoad.h" class inBitmapDecoder : public imgIDecoder { @@ -45,7 +45,6 @@ public: private: nsCOMPtr mImage; nsCOMPtr mFrame; - nsCOMPtr mRequest; nsCOMPtr mObserver; // this is just qi'd from mRequest for speed };