From aabc86a10bf891f050a2172a74aaae3deee88660 Mon Sep 17 00:00:00 2001 From: Timothy Nikkel Date: Sun, 11 Apr 2010 00:09:55 -0500 Subject: [PATCH] Backed out changeset 633cc14c86b8 (bug 553363) to try to fix tsvg_opacity regression. --- uriloader/base/nsDocLoader.cpp | 11 +++-------- uriloader/base/nsDocLoader.h | 8 +------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index f307763c4e8..e67f97444ee 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -153,7 +153,6 @@ nsDocLoader::nsDocLoader() mListenerInfoList(8), mIsLoadingDocument(PR_FALSE), mIsRestoringDocument(PR_FALSE), - mDontFlushLayout(PR_FALSE), mIsFlushingLayout(PR_FALSE) { #if defined(PR_LOGGING) @@ -328,10 +327,6 @@ nsDocLoader::Stop(void) if (mLoadGroup) rv = mLoadGroup->Cancel(NS_BINDING_ABORTED); - // Don't report that we're flushing layout so IsBusy returns false after a - // Stop call. - mIsFlushingLayout = PR_FALSE; - // Clear out mChildrenInOnload. We want to make sure to fire our // onload at this point, and there's no issue with mChildrenInOnload // after this, since mDocumentRequest will be null after the @@ -753,13 +748,13 @@ void nsDocLoader::DocLoaderIsEmpty(PRBool aFlushLayout) // The load group for this DocumentLoader is idle. Flush layout if we need // to. - if (aFlushLayout && !mDontFlushLayout) { + if (aFlushLayout) { nsCOMPtr domDoc = do_GetInterface(GetAsSupports(this)); nsCOMPtr doc = do_QueryInterface(domDoc); if (doc) { - mDontFlushLayout = mIsFlushingLayout = PR_TRUE; + mIsFlushingLayout = PR_TRUE; doc->FlushPendingNotifications(Flush_Layout); - mDontFlushLayout = mIsFlushingLayout = PR_FALSE; + mIsFlushingLayout = PR_FALSE; } } diff --git a/uriloader/base/nsDocLoader.h b/uriloader/base/nsDocLoader.h index 1f5b189cc94..0d7df362403 100644 --- a/uriloader/base/nsDocLoader.h +++ b/uriloader/base/nsDocLoader.h @@ -246,13 +246,7 @@ protected: PRPackedBool mIsRestoringDocument; /* Flag to indicate that we're in the process of flushing layout - under DocLoaderIsEmpty() and should not do another flush. */ - PRPackedBool mDontFlushLayout; - - /* Flag to indicate whether we should consider ourselves as currently - flushing layout for the purposes of IsBusy. For example, if Stop has - been called then IsBusy should return false even if we are still - flushing. */ + undere DocLoaderIsEmpty() */ PRPackedBool mIsFlushingLayout; private: