Bug 17995: Don't reset selection when adding an option to a combobox, as it caused reframing and a crash. r=harishd a=choffman

layout/forms/nsComboboxControlFrame.cpp

@@ -1091,7 +1091,10 @@ nsComboboxControlFrame::AddOption(nsIPresContext* aPresContext, PRInt32 aIndex)
     NS_RELEASE(listFrame);
   }
   // If we added the first option, we might need to select it.
-  MakeSureSomethingIsSelected(aPresContext);
+  // We should call MakeSureSomethingIsSelected here, but since it
+  // it changes selection, which currently causes a reframe, and thus
+  // deletes the frame out from under the caller, causing a crash. (Bug 17995)
+  // XXX BAD MakeSureSomethingIsSelected(aPresContext);
   return rv;
 }
   

layout/html/forms/src/nsComboboxControlFrame.cpp

@@ -1091,7 +1091,10 @@ nsComboboxControlFrame::AddOption(nsIPresContext* aPresContext, PRInt32 aIndex)
     NS_RELEASE(listFrame);
   }
   // If we added the first option, we might need to select it.
-  MakeSureSomethingIsSelected(aPresContext);
+  // We should call MakeSureSomethingIsSelected here, but since it
+  // it changes selection, which currently causes a reframe, and thus
+  // deletes the frame out from under the caller, causing a crash. (Bug 17995)
+  // XXX BAD MakeSureSomethingIsSelected(aPresContext);
   return rv;
 }