Batching removal and making sure I get notified (in an attempt to fix some

of the out of sync problems the tree widget is having).

layout/base/nsCSSFrameConstructor.cpp

@@ -4613,6 +4613,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
       nsTreeRowGroupFrame* treeRowGroup = (nsTreeRowGroupFrame*)parentFrame;
       if (treeRowGroup && treeRowGroup->IsLazy()) {
         treeRowGroup->OnContentRemoved(*aPresContext, childFrame);
+        return NS_OK;
       }
     }
 #endif // INCLUDE_XUL

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -4613,6 +4613,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
       nsTreeRowGroupFrame* treeRowGroup = (nsTreeRowGroupFrame*)parentFrame;
       if (treeRowGroup && treeRowGroup->IsLazy()) {
         treeRowGroup->OnContentRemoved(*aPresContext, childFrame);
+        return NS_OK;
       }
     }
 #endif // INCLUDE_XUL

layout/html/table/src/nsTableFrame.cpp

@@ -3284,7 +3284,9 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext&        aPresContext,
   */
 
   case nsIReflowCommand::FrameRemoved :
-    NS_ASSERTION(nsnull!=objectFrame, "bad objectFrame");
+    if (!objectFrame)
+      break;
+
     NS_ASSERTION(nsnull!=childDisplay, "bad childDisplay");
     if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == childDisplay->mDisplay)
     {

layout/tables/nsTableFrame.cpp

@@ -3284,7 +3284,9 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext&        aPresContext,
   */
 
   case nsIReflowCommand::FrameRemoved :
-    NS_ASSERTION(nsnull!=objectFrame, "bad objectFrame");
+    if (!objectFrame)
+      break;
+
     NS_ASSERTION(nsnull!=childDisplay, "bad childDisplay");
     if (NS_STYLE_DISPLAY_TABLE_COLUMN_GROUP == childDisplay->mDisplay)
     {

layout/xul/base/src/nsTreeRowGroupFrame.cpp

@@ -978,6 +978,32 @@ void nsTreeRowGroupFrame::OnContentRemoved(nsIPresContext& aPresContext,
   // We need to make sure we update things when content gets removed.
   // Clear out our top and bottom frames.
   mTopFrame = mBottomFrame = nsnull;
+
+  nsTableFrame* tableFrame;
+  nsTableFrame::GetTableFrame(this, tableFrame);
+
+  nsTreeFrame* treeFrame = (nsTreeFrame*)tableFrame;
+
+  // Go ahead and delete the frame.
+  mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, aChildFrame);
+  mFrames.DeleteFrame(aPresContext, aChildFrame);
+  treeFrame->InvalidateCellMap();
+  treeFrame->InvalidateColumnCache();
+
+  if (IsLazy() && !treeFrame->IsSlatedForReflow()) {
+    treeFrame->SlateForReflow();
+
+    // Schedule a reflow for us.
+    nsCOMPtr<nsIReflowCommand> reflowCmd;
+    
+    nsresult rv = NS_NewHTMLReflowCommand(getter_AddRefs(reflowCmd), treeFrame,
+                                          nsIReflowCommand::FrameRemoved, nsnull);
+    if (NS_SUCCEEDED(rv)) {
+      nsCOMPtr<nsIPresShell> presShell;
+      aPresContext.GetShell(getter_AddRefs(presShell));
+      presShell->AppendReflowCommand(reflowCmd);
+    }
+  }
 }
 
 void nsTreeRowGroupFrame::SetContentChain(nsISupportsArray* aContentChain)