Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass on stop image load to the image loader too so that circular references can be broken and memory can get released properly

Browse Source
This commit is contained in:
kipp 1998-05-12 01:30:15 +00:00
parent b58d55a356
commit d0ae47e340
2 changed files with 12 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
layout/base/nsPresContext.cpp
View File

@ -32,6 +32,8 @@
#include "nsIURL.h"
#include "nsString.h"
#define NOISY_IMAGES
static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID);
nsPresContext::nsPresContext()
@ -48,7 +50,6 @@ nsPresContext::nsPresContext()
mImageGroup = nsnull;
mLinkHandler = nsnull;
mContainer = nsnull;
mImageUpdates = 0;
}
nsPresContext::~nsPresContext()
@ -281,6 +282,10 @@ nsPresContext::StopLoadImage(nsIFrame* aForFrame)
nsIFrame* loaderFrame;
loader->GetTargetFrame(loaderFrame);
if (loaderFrame == aForFrame) {
#ifdef NOISY_IMAGES
printf("%p: removing %p\n", this, aForFrame);
#endif
loader->StopImageLoad();
NS_RELEASE(loader);
mImageLoaders.RemoveElementAt(i);
n--;
@ -291,47 +296,6 @@ nsPresContext::StopLoadImage(nsIFrame* aForFrame)
return NS_OK;
}
void
nsPresContext::BeginLoadImageUpdate()
{
++mImageUpdates;
}
void
nsPresContext::ImageUpdate(nsIFrame* aFrame)
{
nsIContent* content;
aFrame->GetContent(content);
mPendingImageUpdates.AppendElement(content);
if (0 == mImageUpdates) {
ProcessLoadImageUpdates();
}
}
void
nsPresContext::EndLoadImageUpdate()
{
if (--mImageUpdates == 0) {
ProcessLoadImageUpdates();
}
}
void
nsPresContext::ProcessLoadImageUpdates()
{
PRInt32 i, n = mPendingImageUpdates.Count();
mShell->EnterReflowLock();
mShell->BeginUpdate();
for (i = 0; i < n; i++) {
nsIContent* content = (nsIContent*) mPendingImageUpdates.ElementAt(i);
mShell->ContentChanged(content, nsnull);
NS_RELEASE(content);
}
mPendingImageUpdates.Clear();
mShell->EndUpdate();
mShell->ExitReflowLock();
}
NS_IMETHODIMP
nsPresContext::SetLinkHandler(nsILinkHandler* aHandler)
{ // XXX should probably be a WEAK reference

48
layout/base/src/nsPresContext.cpp
View File

@ -32,6 +32,8 @@
#include "nsIURL.h"
#include "nsString.h"
#define NOISY_IMAGES
static NS_DEFINE_IID(kIPresContextIID, NS_IPRESCONTEXT_IID);
nsPresContext::nsPresContext()
@ -48,7 +50,6 @@ nsPresContext::nsPresContext()
mImageGroup = nsnull;
mLinkHandler = nsnull;
mContainer = nsnull;
mImageUpdates = 0;
}
nsPresContext::~nsPresContext()
@ -281,6 +282,10 @@ nsPresContext::StopLoadImage(nsIFrame* aForFrame)
nsIFrame* loaderFrame;
loader->GetTargetFrame(loaderFrame);
if (loaderFrame == aForFrame) {
#ifdef NOISY_IMAGES
printf("%p: removing %p\n", this, aForFrame);
#endif
loader->StopImageLoad();
NS_RELEASE(loader);
mImageLoaders.RemoveElementAt(i);
n--;
@ -291,47 +296,6 @@ nsPresContext::StopLoadImage(nsIFrame* aForFrame)
return NS_OK;
}
void
nsPresContext::BeginLoadImageUpdate()
{
++mImageUpdates;
}
void
nsPresContext::ImageUpdate(nsIFrame* aFrame)
{
nsIContent* content;
aFrame->GetContent(content);
mPendingImageUpdates.AppendElement(content);
if (0 == mImageUpdates) {
ProcessLoadImageUpdates();
}
}
void
nsPresContext::EndLoadImageUpdate()
{
if (--mImageUpdates == 0) {
ProcessLoadImageUpdates();
}
}
void
nsPresContext::ProcessLoadImageUpdates()
{
PRInt32 i, n = mPendingImageUpdates.Count();
mShell->EnterReflowLock();
mShell->BeginUpdate();
for (i = 0; i < n; i++) {
nsIContent* content = (nsIContent*) mPendingImageUpdates.ElementAt(i);
mShell->ContentChanged(content, nsnull);
NS_RELEASE(content);
}
mPendingImageUpdates.Clear();
mShell->EndUpdate();
mShell->ExitReflowLock();
}
NS_IMETHODIMP
nsPresContext::SetLinkHandler(nsILinkHandler* aHandler)
{ // XXX should probably be a WEAK reference