From d191a3abd86a83ff2dac998fd7f164da0c3c6b78 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 1 Jun 2010 12:41:45 +1200
Subject: [PATCH] Backed out changeset 95894b2d2c52

---
 content/html/content/public/nsIFormControl.h       | 2 ++
 content/html/content/src/nsGenericHTMLElement.cpp  | 2 ++
 content/html/content/src/nsHTMLFormElement.cpp     | 2 ++
 embedding/browser/gtk/src/EmbedContextMenuInfo.cpp | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/content/html/content/public/nsIFormControl.h b/content/html/content/public/nsIFormControl.h
index d0694e9d0362..61fdc290b4e5 100644
--- a/content/html/content/public/nsIFormControl.h
+++ b/content/html/content/public/nsIFormControl.h
@@ -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,
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 47f983f30ccd..af5706ff45a7 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -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;
 }
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index aeccab9382dc..2426ccee0b81 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -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;
diff --git a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
index e2fa2e6742c8..0a9791d1738f 100644
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
@@ -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: