From 495b7681f463f2dd2e2739fb314a847b60446eea Mon Sep 17 00:00:00 2001 From: michaelp Date: Tue, 2 Jun 1998 22:05:45 +0000 Subject: [PATCH] prevented infinite paint/damage loop. git-svn-id: svn://10.0.0.236/trunk@2959 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresContext.cpp | 9 +++++---- mozilla/layout/base/src/nsPresContext.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index 0a370a96bb2..5edca85b056 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -282,14 +282,15 @@ nsPresContext::LoadImage(const nsString& aURL, if (NS_OK != rv) { return rv; } - rv = loader->Init(this, mImageGroup, aURL, aTargetFrame, aNeedSizeUpdate); - if (NS_OK != rv) { - return rv; - } mImageLoaders.AppendElement(loader); // Return new loader NS_ADDREF(loader); + + rv = loader->Init(this, mImageGroup, aURL, aTargetFrame, aNeedSizeUpdate); + if (NS_OK != rv) { + return rv; + } aLoaderResult = loader; return NS_OK; } diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index 0a370a96bb2..5edca85b056 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -282,14 +282,15 @@ nsPresContext::LoadImage(const nsString& aURL, if (NS_OK != rv) { return rv; } - rv = loader->Init(this, mImageGroup, aURL, aTargetFrame, aNeedSizeUpdate); - if (NS_OK != rv) { - return rv; - } mImageLoaders.AppendElement(loader); // Return new loader NS_ADDREF(loader); + + rv = loader->Init(this, mImageGroup, aURL, aTargetFrame, aNeedSizeUpdate); + if (NS_OK != rv) { + return rv; + } aLoaderResult = loader; return NS_OK; }