back out patch for bug 262236 on request

layout/forms/nsListControlFrame.cpp

@@ -309,7 +309,6 @@ nsListControlFrame::nsListControlFrame(nsIPresShell* aShell,
 
   mDummyFrame                  = nsnull;
 
-  mControlSelectMode           = PR_FALSE;
   REFLOW_COUNTER_INIT()
 }
 
@@ -2987,15 +2986,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
   // DOM_VK_ESCAPE cancels the selection
   // default processing checks to see if the pressed the first 
   //   letter of an item in the list and advances to it
-  
-  if (isControl && (keycode == nsIDOMKeyEvent::DOM_VK_UP ||
-                    keycode == nsIDOMKeyEvent::DOM_VK_LEFT ||
-                    keycode == nsIDOMKeyEvent::DOM_VK_DOWN ||
-                    keycode == nsIDOMKeyEvent::DOM_VK_RIGHT)) {
-    mControlSelectMode = PR_TRUE;
-  } else if (charcode != ' ') {
-    mControlSelectMode = PR_FALSE;
-  }
+
   switch (keycode) {
 
     case nsIDOMKeyEvent::DOM_VK_UP:
@@ -3175,8 +3166,6 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
       mStartSelectionIndex = newIndex;
       mEndSelectionIndex = newIndex;
       ScrollToIndex(newIndex);
-    } else if (mControlSelectMode && charcode == ' ') {
-      SingleSelection(newIndex, PR_TRUE);
     } else {
       PRBool wasChanged = PerformSelection(newIndex, isShift, isControl);
       if (wasChanged) {

layout/forms/nsListControlFrame.h

@@ -265,13 +265,13 @@ protected:
   PRInt32      mEndSelectionIndex;
 
   nsIComboboxControlFrame *mComboboxFrame;
+  PRPackedBool mChangesSinceDragStart;
+  PRPackedBool mButtonDown;
   nscoord      mMaxWidth;
   nscoord      mMaxHeight;
   PRInt32      mNumDisplayRows;
-  PRPackedBool mChangesSinceDragStart;
-  PRPackedBool mButtonDown;
 
-  PRPackedBool mIsAllContentHere;
+  PRBool       mIsAllContentHere;
   PRPackedBool mIsAllFramesHere;
   PRPackedBool mHasBeenInitialized;
   PRPackedBool mNeedToReset;
@@ -279,9 +279,6 @@ protected:
 
   PRPackedBool mOverrideReflowOpt;
 
-  //bool value for multiple discontiguous selection
-  PRPackedBool mControlSelectMode;
-
   nsRefPtr<nsListEventListener> mEventListener;
 
   PRInt16 mPassId;