Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
layout/base/nsPresContext.cpp
+ 3
− 0
View file @ 86ed071b
......@@ -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
View file @ 86ed071b
......@@ -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--;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment