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

Use callback to trigger frame reflows instead of hardwiring in a content-changed reflow

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11161 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1998-09-26 18:35:21 +00:00
parent 98c2ef3acc
commit 1bf34c11eb
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/base/src/nsFrameImageLoader.cpp
View File

@ -37,14 +37,13 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static PRLogModuleInfo* gFrameImageLoaderLMI;
NS_LAYOUT nsresult
NS_NewFrameImageLoader(nsIFrameImageLoader** aInstancePtrResult)
NS_NewFrameImageLoader(nsIFrameImageLoader** aResult)
{
nsFrameImageLoader* it = new nsFrameImageLoader();
if (nsnull == it) {
return NS_ERROR_OUT_OF_MEMORY;
}
return it->QueryInterface(kIFrameImageLoaderIID,
(void**) aInstancePtrResult);
return it->QueryInterface(kIFrameImageLoaderIID, (void**) aResult);
}
nsFrameImageLoader::nsFrameImageLoader()
@ -55,6 +54,7 @@ nsFrameImageLoader::nsFrameImageLoader()
mSize.height = 0;
mError = (nsImageError) -1;
mTargetFrame = nsnull;
mCallBack = nsnull;
mPresContext = nsnull;
mImageRequest = nsnull;
mImageLoadStatus = NS_IMAGE_LOAD_STATUS_NONE;
@ -110,6 +110,7 @@ nsFrameImageLoader::Init(nsIPresContext* aPresContext,
const nsString& aURL,
const nscolor* aBackgroundColor,
nsIFrame* aTargetFrame,
nsFrameImageLoaderCB aCallBack,
PRBool aNeedSizeUpdate)
{
NS_PRECONDITION(nsnull != aPresContext, "null ptr");
@ -122,6 +123,7 @@ nsFrameImageLoader::Init(nsIPresContext* aPresContext,
return NS_ERROR_ALREADY_INITIALIZED;
}
mTargetFrame = aTargetFrame;
mCallBack = aCallBack;
mPresContext = aPresContext;
NS_IF_ADDREF(mPresContext);
if (aNeedSizeUpdate) {
@ -338,16 +340,8 @@ nsFrameImageLoader::ReflowFrame()
("nsFrameImageLoader::ReflowFrame frame=%p status=%x",
mTargetFrame, mImageLoadStatus));
nsIContent* content = nsnull;
mTargetFrame->GetContent(content);
if (nsnull != content) {
nsIDocument* document = nsnull;
content->GetDocument(document);
if (nsnull != document) {
document->ContentChanged(content, nsnull);
NS_RELEASE(document);
}
NS_RELEASE(content);
if (nsnull != mCallBack) {
(*mCallBack)(*mPresContext, mTargetFrame, mImageLoadStatus);
}
}