Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 196072. Don't invalidate image area when incoming image data is for different frame. r=pavlov sr=bz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138996 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
paper%animecity.nu
2003-03-05 23:55:53 +00:00
parent 4e1e0a9e8b
commit 3f6fe85102
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/layout/generic/nsImageFrame.cpp
View File

@@ -95,6 +95,7 @@
#include "nsCSSFrameConstructor.h"
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "gfxIImageFrame.h"
#ifdef DEBUG
#undef NOISY_IMAGE_LOADING
@@ -438,6 +439,18 @@ NS_IMETHODIMP nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
if (whichLoad != 0) return NS_OK;
struct ImageLoad *load= &mLoads[whichLoad];
// Don't invalidate if the current visible frame isn't the one the data is
// from
if (load->mRequest) {
nsCOMPtr<imgIContainer> container;
load->mRequest->GetImage(getter_AddRefs(container));
if (container) {
nsCOMPtr<gfxIImageFrame> gfxImgFrame;
container->GetCurrentFrame(getter_AddRefs(gfxImgFrame));
if (gfxImgFrame != aFrame)
return NS_OK;
}
}
nsRect r(aRect->x, aRect->y, aRect->width, aRect->height);

13
mozilla/layout/html/base/src/nsImageFrame.cpp
View File

@@ -95,6 +95,7 @@
#include "nsCSSFrameConstructor.h"
#include "nsIPrefBranch.h"
#include "nsIPrefService.h"
#include "gfxIImageFrame.h"
#ifdef DEBUG
#undef NOISY_IMAGE_LOADING
@@ -438,6 +439,18 @@ NS_IMETHODIMP nsImageFrame::OnDataAvailable(imgIRequest *aRequest,
if (whichLoad != 0) return NS_OK;
struct ImageLoad *load= &mLoads[whichLoad];
// Don't invalidate if the current visible frame isn't the one the data is
// from
if (load->mRequest) {
nsCOMPtr<imgIContainer> container;
load->mRequest->GetImage(getter_AddRefs(container));
if (container) {
nsCOMPtr<gfxIImageFrame> gfxImgFrame;
container->GetCurrentFrame(getter_AddRefs(gfxImgFrame));
if (gfxImgFrame != aFrame)
return NS_OK;
}
}
nsRect r(aRect->x, aRect->y, aRect->width, aRect->height);