Merge back out of changeset 633cc14c86b8 (bug 553363) to try to fix tsvg_opacity regression.

uriloader/base/nsDocLoader.cpp

@@ -151,7 +151,6 @@ nsDocLoader::nsDocLoader()
     mListenerInfoList(8),
     mIsLoadingDocument(PR_FALSE),
     mIsRestoringDocument(PR_FALSE),
-    mDontFlushLayout(PR_FALSE),
     mIsFlushingLayout(PR_FALSE)
 {
 #if defined(PR_LOGGING)
@@ -326,10 +325,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
@@ -751,13 +746,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<nsIDOMDocument> domDoc = do_GetInterface(GetAsSupports(this));
       nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
       if (doc) {
-        mDontFlushLayout = mIsFlushingLayout = PR_TRUE;
+        mIsFlushingLayout = PR_TRUE;
         doc->FlushPendingNotifications(Flush_Layout);
-        mDontFlushLayout = mIsFlushingLayout = PR_FALSE;
+        mIsFlushingLayout = PR_FALSE;
       }
     }
 

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: