Backing out changes made while tree was closed.

layout/html/forms/src/nsCheckboxControlFrame.cpp

@@ -189,7 +189,7 @@ nsCheckboxControlFrame::AttributeChanged(nsIPresContext* aPresContext,
 
 
 void 
-nsCheckboxControlFrame::MouseUp(nsIPresContext* aPresContext) 
+nsCheckboxControlFrame::MouseClicked(nsIPresContext* aPresContext) 
 {
   if ( IsTristateCheckbox() ) {
     CheckState newState = eOn;
@@ -272,14 +272,9 @@ NS_METHOD nsCheckboxControlFrame::HandleEvent(nsIPresContext& aPresContext,
 {
   if (nsEventStatus_eConsumeNoDefault == aEventStatus)
     return NS_OK;
-
   if (nsFormFrame::GetDisabled(this))
     return NS_OK;
 
-  if (NS_MOUSE_LEFT_BUTTON_UP == aEvent->message) {
-    MouseUp(&aPresContext);
-  }
-
   return(nsNativeFormControlFrame::HandleEvent(aPresContext, aEvent, aEventStatus));
 }
 

layout/html/forms/src/nsCheckboxControlFrame.h

@@ -71,7 +71,7 @@ public:
   virtual PRInt32 GetMaxNumValues();
   virtual PRBool GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues,
                                 nsString* aValues, nsString* aNames);
-  virtual void MouseUp(nsIPresContext* aPresContext);
+  virtual void MouseClicked(nsIPresContext* aPresContext);
 
    // nsFormControlFrame overrides
   nsresult RequiresWidget(PRBool &aHasWidget);

layout/html/forms/src/nsRadioControlFrame.cpp

@@ -82,7 +82,7 @@ nsRadioControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nscoord& aWi
 }
 
 void 
-nsRadioControlFrame::MouseUp(nsIPresContext* aPresContext) 
+nsRadioControlFrame::MouseClicked(nsIPresContext* aPresContext) 
 {
   SetRadioControlFrameState(NS_STRING_TRUE);
   
@@ -201,11 +201,6 @@ nsRadioControlFrame::HandleEvent(nsIPresContext& aPresContext,
         }
       }
       break;
-    case NS_MOUSE_LEFT_BUTTON_UP:
-       MouseUp(&aPresContext);
-     break;
-
-    
     default:
       break;
   }

layout/html/forms/src/nsRadioControlFrame.h

@@ -59,7 +59,7 @@ public:
   virtual PRBool GetNamesValues(PRInt32 aMaxNumValues, PRInt32& aNumValues,
                                 nsString* aValues, nsString* aNames);
 
-  virtual void MouseUp(nsIPresContext* aPresContext);
+  virtual void MouseClicked(nsIPresContext* aPresContext);
   virtual void Reset();
   virtual const nsIID& GetCID();