diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h
index e898496a73b..4a2fbc1cb9f 100644
--- a/mozilla/content/base/public/nsIDocument.h
+++ b/mozilla/content/base/public/nsIDocument.h
@@ -339,8 +339,7 @@ public:
 
   NS_IMETHOD_(PRBool) EventCaptureRegistration(PRInt32 aCapturerIncrement) = 0;
   
-  NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows=PR_TRUE,
-                                       PRBool aUpdateViews=PR_FALSE) = 0;
+  NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows=PR_TRUE) = 0;
 
   NS_IMETHOD GetAndIncrementContentID(PRInt32* aID) = 0;
 
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 9c2c9fb7a99..9c591f898e7 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -3259,7 +3259,7 @@ nsDocument::GetFileSpec(nsIFile * *aFileSpec)
 }
 
 NS_IMETHODIMP 
-nsDocument::FlushPendingNotifications(PRBool aFlushReflows, PRBool aUpdateViews)
+nsDocument::FlushPendingNotifications(PRBool aFlushReflows)
 {
   if (aFlushReflows) {
 
@@ -3268,7 +3268,7 @@ nsDocument::FlushPendingNotifications(PRBool aFlushReflows, PRBool aUpdateViews)
     for (i = 0; i < count; i++) {
       nsIPresShell* shell = NS_STATIC_CAST(nsIPresShell*, mPresShells[i]);
       if (shell) {
-        shell->FlushPendingNotifications(aUpdateViews);
+        shell->FlushPendingNotifications();
       }
     }
   }
diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h
index c8774b150de..74cb94358f7 100644
--- a/mozilla/content/base/src/nsDocument.h
+++ b/mozilla/content/base/src/nsDocument.h
@@ -454,8 +454,7 @@ public:
   NS_IMETHOD StyleRuleRemoved(nsIStyleSheet* aStyleSheet,
                               nsIStyleRule* aStyleRule);
 
-  NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows = PR_TRUE,
-                                       PRBool aUpdateViews = PR_FALSE);
+  NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows = PR_TRUE);
   NS_IMETHOD GetAndIncrementContentID(PRInt32* aID);
   NS_IMETHOD GetBindingManager(nsIBindingManager** aResult);
   NS_IMETHOD GetNodeInfoManager(nsINodeInfoManager*& aNodeInfoManager);
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index 9def9e994f7..1a9e5bf66c4 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -3925,7 +3925,7 @@ void nsEventStateManager::FlushPendingEvents(nsIPresContext* aPresContext) {
   nsCOMPtr<nsIPresShell> shell;
   aPresContext->GetShell(getter_AddRefs(shell));
   if (nsnull != shell) {
-    shell->FlushPendingNotifications(PR_FALSE);
+    shell->FlushPendingNotifications();
     nsCOMPtr<nsIViewManager> viewManager;
     shell->GetViewManager(getter_AddRefs(viewManager));
     if (viewManager) {
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 6b0f7953676..69768532c40 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -3984,7 +3984,7 @@ HTMLContentSink::ScrollToRef()
       mDocument->GetShellAt(i, getter_AddRefs(shell));
       if (shell) {
         // Scroll to the anchor
-        shell->FlushPendingNotifications(PR_FALSE);
+        shell->FlushPendingNotifications();
 
         // Check an empty string which might be caused by the UTF-8 conversion
         if (!ref.IsEmpty())
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 43a854cedeb..80ca1ea4264 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -276,7 +276,7 @@ nsXMLContentSink::ScrollToRef()
       mDocument->GetShellAt(i, getter_AddRefs(shell));
       if (shell) {
         // Scroll to the anchor
-        shell->FlushPendingNotifications(PR_FALSE);
+        shell->FlushPendingNotifications();
 
         // Check an empty string which might be caused by the UTF-8 conversion
         if (!ref.IsEmpty())
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index a289167bbc5..7c1253307ca 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -2013,7 +2013,7 @@ nsXULDocument::FindNext(const nsAReadableString &aSearchStr,
 
 
 NS_IMETHODIMP
-nsXULDocument::FlushPendingNotifications(PRBool aFlushReflows, PRBool aUpdateViews)
+nsXULDocument::FlushPendingNotifications(PRBool aFlushReflows)
 {
   if (aFlushReflows) {
 
@@ -2022,7 +2022,7 @@ nsXULDocument::FlushPendingNotifications(PRBool aFlushReflows, PRBool aUpdateVie
     for (i = 0; i < count; i++) {
       nsIPresShell* shell = NS_STATIC_CAST(nsIPresShell*, mPresShells[i]);
       if (shell) {
-        shell->FlushPendingNotifications(aUpdateViews);
+        shell->FlushPendingNotifications();
       }
     }
   }
diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h
index a8993bca823..f02ef7f9489 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.h
+++ b/mozilla/content/xul/document/src/nsXULDocument.h
@@ -298,7 +298,7 @@ public:
 
     NS_IMETHOD FindNext(const nsAReadableString &aSearchStr, PRBool aMatchCase, PRBool aSearchDown, PRBool &aIsFound);
 
-    NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows = PR_TRUE, PRBool aUpdateViews = PR_FALSE);
+    NS_IMETHOD FlushPendingNotifications(PRBool aFlushReflows = PR_TRUE);
 
     NS_IMETHOD GetAndIncrementContentID(PRInt32* aID);
 
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index c7e4329efad..ca43ca7abb1 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -1579,7 +1579,7 @@ static void EnsureReflowFlushAndPaint(nsIDocShell* aDocShell)
     return;
 
   // Flush pending reflows.
-  presShell->FlushPendingNotifications(PR_FALSE);
+  presShell->FlushPendingNotifications();
 
   // Unsuppress painting.
   presShell->UnsuppressPainting();
diff --git a/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp b/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp
index 805c77f0b72..2c3a3d002c7 100644
--- a/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp
+++ b/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp
@@ -220,7 +220,7 @@ inLayoutUtils::GetScreenOrigin(nsIDOMElement* aElement)
     
     if (presShell) {
       // Flush all pending notifications so that our frames are uptodate
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
 
       nsCOMPtr<nsIPresContext> presContext;
       presShell->GetPresContext(getter_AddRefs(presContext));
diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp
index 75c571d0dd8..e4ca76aa134 100644
--- a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp
+++ b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp
@@ -2915,7 +2915,7 @@ NS_IMETHODIMP mozXMLTermSession::ScrollToBottomLeft(void)
   if (NS_FAILED(result) || !presShell)
     return NS_ERROR_FAILURE;
 
-  presShell->FlushPendingNotifications(PR_FALSE);
+  presShell->FlushPendingNotifications();
 
   // Get DOM Window
   nsCOMPtr<nsIDocShell> docShell;
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 788e03c8f1e..ac3942e7338 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -8127,7 +8127,7 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
           treeRowGroup->RegenerateRowGroupInfo(0);
          
           if (!treeRowGroup->IsBatching())
-            shell->FlushPendingNotifications(PR_FALSE);
+            shell->FlushPendingNotifications();
 
           return NS_OK;
         }
@@ -8599,7 +8599,7 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
           }
 
           if (!treeRowGroup->IsBatching())
-            shell->FlushPendingNotifications(PR_FALSE);
+            shell->FlushPendingNotifications();
           return NS_OK;
         }
       }
@@ -9281,7 +9281,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
             treeRowGroup->MarkDirtyChildren(state);
 
             if (!treeRowGroup->IsBatching())
-              shell->FlushPendingNotifications(PR_FALSE);
+              shell->FlushPendingNotifications();
           }
           return NS_OK;
         }
diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h
index 864c97c95ef..61b91b030d4 100644
--- a/mozilla/layout/base/nsIPresShell.h
+++ b/mozilla/layout/base/nsIPresShell.h
@@ -295,9 +295,8 @@ public:
   /**
    * Flush all pending notifications such that the presentation is
    * in sync with the content.
-   * @param aUpdateViews PR_TRUE causes the affected views to be refreshed immediately.
    */
-  NS_IMETHOD FlushPendingNotifications(PRBool aUpdateViews) = 0;
+  NS_IMETHOD FlushPendingNotifications() = 0;
 
   /**
    * Post a request to handle a DOM event after Reflow has finished.
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index bfad948bcbc..6580268d445 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -866,7 +866,7 @@ public:
                                          PRBool                        aProcessDummyLayoutRequest = PR_TRUE);  
   NS_IMETHOD CancelAllReflowCommands();
   NS_IMETHOD IsSafeToFlush(PRBool& aIsSafeToFlush);
-  NS_IMETHOD FlushPendingNotifications(PRBool aUpdateViews=PR_FALSE);
+  NS_IMETHOD FlushPendingNotifications();
 
   /**
    * Post a request to handle a DOM event after Reflow has finished.
@@ -4868,21 +4868,13 @@ PresShell::IsSafeToFlush(PRBool& aIsSafeToFlush)
 
 
 NS_IMETHODIMP 
-PresShell::FlushPendingNotifications(PRBool aUpdateViews)
+PresShell::FlushPendingNotifications()
 {
   PRBool isSafeToFlush;
   IsSafeToFlush(isSafeToFlush);
 
   if (isSafeToFlush) {
-    if (aUpdateViews && mViewManager) {
-      mViewManager->BeginUpdateViewBatch();
-    }
-
     ProcessReflowCommands(PR_FALSE);
-
-    if (aUpdateViews && mViewManager) {
-      mViewManager->EndUpdateViewBatch(NS_VMREFRESH_IMMEDIATE);
-    }
   }
 
   return NS_OK;
diff --git a/mozilla/layout/base/public/nsIPresShell.h b/mozilla/layout/base/public/nsIPresShell.h
index 864c97c95ef..61b91b030d4 100644
--- a/mozilla/layout/base/public/nsIPresShell.h
+++ b/mozilla/layout/base/public/nsIPresShell.h
@@ -295,9 +295,8 @@ public:
   /**
    * Flush all pending notifications such that the presentation is
    * in sync with the content.
-   * @param aUpdateViews PR_TRUE causes the affected views to be refreshed immediately.
    */
-  NS_IMETHOD FlushPendingNotifications(PRBool aUpdateViews) = 0;
+  NS_IMETHOD FlushPendingNotifications() = 0;
 
   /**
    * Post a request to handle a DOM event after Reflow has finished.
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 7b1018a0d24..06ea9cd5cf9 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -668,7 +668,7 @@ nsComboboxControlFrame::ShowList(nsIPresContext* aPresContext, PRBool aShowList)
 
   nsCOMPtr<nsIPresShell> presShell;
   aPresContext->GetShell(getter_AddRefs(presShell));
-  presShell->FlushPendingNotifications(PR_FALSE);
+  presShell->FlushPendingNotifications();
 
   if (widget)
     widget->CaptureRollupEvents((nsIRollupListener *)this, mDroppedDown, PR_TRUE);
@@ -2064,7 +2064,7 @@ nsComboboxControlFrame::SelectionChanged()
 
       nsCOMPtr<nsIPresShell> presShell;
       mPresContext->GetShell(getter_AddRefs(presShell));
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
     }
   }
   return rv;
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index 9e539fa5c04..a2782052e96 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -4185,7 +4185,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
     if (IsInDropDownMode() == PR_TRUE) {
       nsCOMPtr<nsIPresShell> presShell;
       mPresContext->GetShell(getter_AddRefs(presShell));
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
     }
     REFLOW_DEBUG_MSG2("  After: %d\n", mSelectedIndex);
   } else {
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index bfad948bcbc..6580268d445 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -866,7 +866,7 @@ public:
                                          PRBool                        aProcessDummyLayoutRequest = PR_TRUE);  
   NS_IMETHOD CancelAllReflowCommands();
   NS_IMETHOD IsSafeToFlush(PRBool& aIsSafeToFlush);
-  NS_IMETHOD FlushPendingNotifications(PRBool aUpdateViews=PR_FALSE);
+  NS_IMETHOD FlushPendingNotifications();
 
   /**
    * Post a request to handle a DOM event after Reflow has finished.
@@ -4868,21 +4868,13 @@ PresShell::IsSafeToFlush(PRBool& aIsSafeToFlush)
 
 
 NS_IMETHODIMP 
-PresShell::FlushPendingNotifications(PRBool aUpdateViews)
+PresShell::FlushPendingNotifications()
 {
   PRBool isSafeToFlush;
   IsSafeToFlush(isSafeToFlush);
 
   if (isSafeToFlush) {
-    if (aUpdateViews && mViewManager) {
-      mViewManager->BeginUpdateViewBatch();
-    }
-
     ProcessReflowCommands(PR_FALSE);
-
-    if (aUpdateViews && mViewManager) {
-      mViewManager->EndUpdateViewBatch(NS_VMREFRESH_IMMEDIATE);
-    }
   }
 
   return NS_OK;
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index 7b1018a0d24..06ea9cd5cf9 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -668,7 +668,7 @@ nsComboboxControlFrame::ShowList(nsIPresContext* aPresContext, PRBool aShowList)
 
   nsCOMPtr<nsIPresShell> presShell;
   aPresContext->GetShell(getter_AddRefs(presShell));
-  presShell->FlushPendingNotifications(PR_FALSE);
+  presShell->FlushPendingNotifications();
 
   if (widget)
     widget->CaptureRollupEvents((nsIRollupListener *)this, mDroppedDown, PR_TRUE);
@@ -2064,7 +2064,7 @@ nsComboboxControlFrame::SelectionChanged()
 
       nsCOMPtr<nsIPresShell> presShell;
       mPresContext->GetShell(getter_AddRefs(presShell));
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
     }
   }
   return rv;
diff --git a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp
index deafd2a06d1..a6bdfab2973 100644
--- a/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxListControlFrame.cpp
@@ -3869,7 +3869,7 @@ nsGfxListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
     if (IsInDropDownMode() == PR_TRUE && mComboboxFrame) {
       nsCOMPtr<nsIPresShell> presShell;
       mPresContext->GetShell(getter_AddRefs(presShell));
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
     }
     REFLOW_DEBUG_MSG2("  After: %d\n", mSelectedIndex);
   } else {
diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
index 9e539fa5c04..a2782052e96 100644
--- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
@@ -4185,7 +4185,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
     if (IsInDropDownMode() == PR_TRUE) {
       nsCOMPtr<nsIPresShell> presShell;
       mPresContext->GetShell(getter_AddRefs(presShell));
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
     }
     REFLOW_DEBUG_MSG2("  After: %d\n", mSelectedIndex);
   } else {
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 788e03c8f1e..ac3942e7338 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -8127,7 +8127,7 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
           treeRowGroup->RegenerateRowGroupInfo(0);
          
           if (!treeRowGroup->IsBatching())
-            shell->FlushPendingNotifications(PR_FALSE);
+            shell->FlushPendingNotifications();
 
           return NS_OK;
         }
@@ -8599,7 +8599,7 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
           }
 
           if (!treeRowGroup->IsBatching())
-            shell->FlushPendingNotifications(PR_FALSE);
+            shell->FlushPendingNotifications();
           return NS_OK;
         }
       }
@@ -9281,7 +9281,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
             treeRowGroup->MarkDirtyChildren(state);
 
             if (!treeRowGroup->IsBatching())
-              shell->FlushPendingNotifications(PR_FALSE);
+              shell->FlushPendingNotifications();
           }
           return NS_OK;
         }
diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp
index 24cf04411ef..2460e5b2197 100644
--- a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp
@@ -305,7 +305,7 @@ nsPolygonFrame::AttributeChanged(nsIPresContext* aPresContext,
     if (NS_SUCCEEDED(rv)) {
       shell->AppendReflowCommand(reflowCmd);
       NS_RELEASE(reflowCmd);
-      rv = shell->FlushPendingNotifications(PR_FALSE);
+      rv = shell->FlushPendingNotifications();
     }
   } else if (aAttribute == nsSVGAtoms::x) {
   } else if (aAttribute == nsSVGAtoms::y) {
diff --git a/mozilla/layout/xul/base/src/nsBoxObject.cpp b/mozilla/layout/xul/base/src/nsBoxObject.cpp
index 7600f48200f..543c4ac7886 100644
--- a/mozilla/layout/xul/base/src/nsBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxObject.cpp
@@ -156,7 +156,7 @@ nsBoxObject::GetOffsetRect(nsRect& aRect)
 
     if(presShell) {
       // Flush all pending notifications so that our frames are uptodate
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
 
       // Get the Frame for our content
       nsIFrame* frame = nsnull;
@@ -267,7 +267,7 @@ nsBoxObject::GetScreenRect(nsRect& aRect)
     
     if (presShell) {
       // Flush all pending notifications so that our frames are uptodate
-      presShell->FlushPendingNotifications(PR_FALSE);
+      presShell->FlushPendingNotifications();
 
       nsCOMPtr<nsIPresContext> presContext;
       presShell->GetPresContext(getter_AddRefs(presContext));
diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
index 2667812f1ad..c6cf411fbd5 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -755,7 +755,7 @@ nsMenuFrame::OpenMenuInternal(PRBool aActivateFlag)
 
          nsCOMPtr<nsIPresShell> shell;
          mPresContext->GetShell(getter_AddRefs(shell));
-         shell->FlushPendingNotifications(PR_FALSE);
+         shell->FlushPendingNotifications();
       }
 
       nsRect curRect;
@@ -776,7 +776,7 @@ nsMenuFrame::OpenMenuInternal(PRBool aActivateFlag)
          menuPopup->MarkDirty(state);
          nsCOMPtr<nsIPresShell> shell;
          mPresContext->GetShell(getter_AddRefs(shell));
-         shell->FlushPendingNotifications(PR_FALSE);
+         shell->FlushPendingNotifications();
       }
 
       ActivateMenu(PR_TRUE);
diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
index fd270500210..1b36815cb42 100644
--- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
@@ -1166,7 +1166,7 @@ if (realTimeDrag) {
     }
 
     viewManager->DisableRefresh();
-    shell->FlushPendingNotifications(PR_FALSE);
+    shell->FlushPendingNotifications();  
     viewManager->EnableRefresh(NS_VMREFRESH_NO_SYNC);
 
     viewManager->UpdateView(view, damageRect, NS_VMREFRESH_IMMEDIATE);
diff --git a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp
index 0d5fb3c20f7..da57d8a9294 100644
--- a/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsXULTreeGroupFrame.cpp
@@ -499,7 +499,7 @@ void nsXULTreeGroupFrame::OnContentRemoved(nsIPresContext* aPresContext,
   MarkDirtyChildren(state);
   nsCOMPtr<nsIPresShell> shell;
   aPresContext->GetShell(getter_AddRefs(shell));
-  shell->FlushPendingNotifications(PR_FALSE);
+  shell->FlushPendingNotifications();
 }
 
 PRBool nsXULTreeGroupFrame::ContinueReflow(nscoord height) 
diff --git a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp
index 6d5345f7870..49ef2aca6df 100644
--- a/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsXULTreeOuterGroupFrame.cpp
@@ -642,7 +642,7 @@ nsXULTreeOuterGroupFrame::PositionChanged(PRInt32 aOldIndex, PRInt32& aNewIndex)
 
      nsCOMPtr<nsIPresShell> shell;
      mPresContext->GetShell(getter_AddRefs(shell));
-     shell->FlushPendingNotifications(PR_FALSE);
+     shell->FlushPendingNotifications();
 
      smoother->mDelta = newTwipIndex > oldTwipIndex ? rowDelta : -rowDelta;
 
@@ -707,7 +707,7 @@ nsXULTreeOuterGroupFrame::InternalPositionChanged(PRBool aUp, PRInt32 aDelta, PR
 
   nsCOMPtr<nsIPresShell> shell;
   mPresContext->GetShell(getter_AddRefs(shell));
-  shell->FlushPendingNotifications(PR_FALSE);
+  shell->FlushPendingNotifications();
 
   PRInt32 visibleRows = 0;
   if (mRowHeight)
@@ -775,7 +775,7 @@ nsXULTreeOuterGroupFrame::InternalPositionChanged(PRBool aUp, PRInt32 aDelta, PR
   nsBoxLayoutState state(mPresContext);
   mScrolling = PR_TRUE;
   MarkDirtyChildren(state);
-  shell->FlushPendingNotifications(PR_FALSE);
+  shell->FlushPendingNotifications();
   mScrolling = PR_FALSE;
   
   VerticalScroll(mYPosition);
diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
index e845e05fb21..9af46fedc38 100644
--- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
+++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp
@@ -414,7 +414,7 @@ nsWebCrawler::OnStateChange(nsIWebProgress* aWebProgress,
     nsCOMPtr<nsIPresShell> shell = dont_AddRef(GetPresShell());
     if (shell) {
       // Force the presentation shell to flush any pending reflows
-      shell->FlushPendingNotifications(PR_FALSE);
+      shell->FlushPendingNotifications();
 
       // Force the view manager to update itself
       nsCOMPtr<nsIViewManager> vm;
diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
index 2db3de9e23f..11033e469e8 100644
--- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -40,10 +40,6 @@
 #include "nsIXULBrowserWindow.h"
 #include "nsPIDOMWindow.h"
 
-// Needed for nsIDocument::FlushPendingNotifications(...)
-#include "nsIDOMDocument.h"
-#include "nsIDocument.h"
-
 // CIDs
 static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
 
@@ -342,24 +338,7 @@ NS_IMETHODIMP nsContentTreeOwner::SetStatus(PRUint32 aStatusType, const PRUnicha
      }
    }
 
-  //
-  // Force pending notifications to be processed immediately... This
-  // causes the status message to be displayed synchronously.
-  //
-  // XXX: This is nasty because we have to drill down to the nsIDocument to
-  //      force the flushing...
-  //
-  nsCOMPtr<nsIDOMDocument> domDoc;
-  nsCOMPtr<nsIDocument> doc;
-
-  domWindow->GetDocument(getter_AddRefs(domDoc));
-  doc = do_QueryInterface(domDoc);
-
-  if (doc) {
-    doc->FlushPendingNotifications(PR_TRUE, PR_TRUE);
-  }
-
-  return NS_OK;
+   return NS_OK;
 }
 
 NS_IMETHODIMP nsContentTreeOwner::SetWebBrowser(nsIWebBrowser* aWebBrowser)