Fix for crash loading bugzilla pages (infinite reflow recursion). by vidur, r=smfr, a=leaf

layout/base/nsPresShell.cpp

@@ -2396,6 +2396,19 @@ PresShell::SetReflowEventStatus(PRBool aPending)
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+PresShell::FlushPendingNotifications()
+{
+  // XXX Only flush if the lock count is 0. Ideally nothing
+  // besides Enter/ExitReflowLock should call ProcessReflowCommands.
+  // Will be changed by Nisheeth.
+  if (!mReflowLockCount) {
+    ProcessReflowCommands(PR_FALSE);
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP 
 PresShell::BeginBatchingReflows()
 {  
@@ -2422,12 +2435,6 @@ PresShell::GetReflowBatchingStatus(PRBool* aIsBatching)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-PresShell::FlushPendingNotifications()
-{  
-  return ProcessReflowCommands(PR_FALSE);  
-}
-
 NS_IMETHODIMP
 PresShell::ContentChanged(nsIDocument *aDocument,
                           nsIContent*  aContent,

layout/html/base/src/nsPresShell.cpp

@@ -2396,6 +2396,19 @@ PresShell::SetReflowEventStatus(PRBool aPending)
   return NS_OK;
 }
 
+NS_IMETHODIMP 
+PresShell::FlushPendingNotifications()
+{
+  // XXX Only flush if the lock count is 0. Ideally nothing
+  // besides Enter/ExitReflowLock should call ProcessReflowCommands.
+  // Will be changed by Nisheeth.
+  if (!mReflowLockCount) {
+    ProcessReflowCommands(PR_FALSE);
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP 
 PresShell::BeginBatchingReflows()
 {  
@@ -2422,12 +2435,6 @@ PresShell::GetReflowBatchingStatus(PRBool* aIsBatching)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
-PresShell::FlushPendingNotifications()
-{  
-  return ProcessReflowCommands(PR_FALSE);  
-}
-
 NS_IMETHODIMP
 PresShell::ContentChanged(nsIDocument *aDocument,
                           nsIContent*  aContent,