Commit 86ed071b authored by kipp%netscape.com's avatar kipp%netscape.com
Browse files

Remember to stop image loads to break connection back to pres context

parent 5cc5d46a

layout/base/nsPresContext.cpp

+3 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ nsPresContext::StartLoadImage(const nsString& aURL, 
                    aTargetFrame, aCallBack, aClosure);

  if (NS_OK != rv) {

    mImageLoaders.RemoveElement(loader);

    loader->StopImageLoad();

    NS_RELEASE(loader);



    // Undo premature store of reslut
@@ -780,6 +781,7 @@ nsPresContext::StopLoadImage(nsIFrame* aTargetFrame, 
      PRBool safe;

      loader->SafeToDestroy(&safe);

      if (safe) {

        loader->StopImageLoad();

        NS_RELEASE(loader);

        mImageLoaders.RemoveElementAt(i);

        n--;
@@ -804,6 +806,7 @@ nsPresContext::StopAllLoadImagesFor(nsIFrame* aTargetFrame) 
      loader->RemoveFrame(aTargetFrame);

      loader->SafeToDestroy(&safe);

      if (safe) {

        loader->StopImageLoad();

        NS_RELEASE(loader);

        mImageLoaders.RemoveElementAt(i);

        n--;

layout/base/src/nsPresContext.cpp

+3 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ nsPresContext::StartLoadImage(const nsString& aURL, 
                    aTargetFrame, aCallBack, aClosure);

  if (NS_OK != rv) {

    mImageLoaders.RemoveElement(loader);

    loader->StopImageLoad();

    NS_RELEASE(loader);



    // Undo premature store of reslut
@@ -780,6 +781,7 @@ nsPresContext::StopLoadImage(nsIFrame* aTargetFrame, 
      PRBool safe;

      loader->SafeToDestroy(&safe);

      if (safe) {

        loader->StopImageLoad();

        NS_RELEASE(loader);

        mImageLoaders.RemoveElementAt(i);

        n--;
@@ -804,6 +806,7 @@ nsPresContext::StopAllLoadImagesFor(nsIFrame* aTargetFrame) 
      loader->RemoveFrame(aTargetFrame);

      loader->SafeToDestroy(&safe);

      if (safe) {

        loader->StopImageLoad();

        NS_RELEASE(loader);

        mImageLoaders.RemoveElementAt(i);

        n--;