Backing out fix for bug 565904 to fix test failures

This commit is contained in:
Robert O'Callahan 2010-06-01 12:42:08 +12:00
commit 4ec358f9bc
4 changed files with 10 additions and 0 deletions

View File

@ -48,6 +48,8 @@ class nsFormSubmission;
enum FormControlsTypes {
NS_FORM_FIELDSET = 1,
NS_FORM_LABEL,
NS_FORM_OPTION,
NS_FORM_OPTGROUP,
NS_FORM_OUTPUT,
NS_FORM_LEGEND,
NS_FORM_SELECT,

View File

@ -2694,6 +2694,8 @@ nsGenericHTMLFormElement::IsLabelableControl() const
PRInt32 type = GetType();
return type != NS_FORM_FIELDSET &&
type != NS_FORM_LABEL &&
type != NS_FORM_OPTION &&
type != NS_FORM_OPTGROUP &&
type != NS_FORM_OBJECT &&
type != NS_FORM_LEGEND;
}

View File

@ -202,6 +202,8 @@ ShouldBeInElements(nsIFormControl* aFormControl)
//
// NS_FORM_INPUT_IMAGE
// NS_FORM_LABEL
// NS_FORM_OPTION
// NS_FORM_OPTGROUP
// NS_FORM_LEGEND
return PR_FALSE;

View File

@ -224,6 +224,10 @@ EmbedContextMenuInfo::SetFormControlType(nsIDOMEventTarget *originalTarget)
break;
case NS_FORM_LABEL:
break;
case NS_FORM_OPTION:
break;
case NS_FORM_OPTGROUP:
break;
case NS_FORM_LEGEND:
break;
case NS_FORM_SELECT: