Added missing methods to nsIFormControlFrame.h

layout/forms/nsIFormControlFrame.h

@@ -20,11 +20,12 @@
 #define nsIFormControlFrame_h___
 
 #include "nsISupports.h"
-// Forward declarations
+#include "nsFont.h"
 class nsFormFrame;
 class nsIPresContext;
 class nsString;
-class nsIAtom;
+class nsIContent;
+
 
 // IID for the nsIFormControlFrame class
 #define NS_IFORMCONTROLFRAME_IID    \
@@ -44,10 +45,6 @@ public:
 
   NS_IMETHOD GetName(nsString* aName) = 0;
 
-  NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue) = 0; 
-
-  NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue) = 0; 
-
   virtual void SetFocus(PRBool aOn = PR_TRUE, PRBool aRepaint = PR_FALSE) = 0;
 
   virtual void MouseClicked(nsIPresContext* aPresContext) = 0;
@@ -62,6 +59,24 @@ public:
                                  nsString* aValues, nsString* aNames) = 0;
 
   virtual void SetFormFrame(nsFormFrame* aFrame) = 0;
+
+  virtual nscoord GetVerticalInsidePadding(float aPixToTwip,
+                                           nscoord aInnerHeight) const = 0;
+  virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext,
+                                             float aPixToTwip, 
+                                             nscoord aInnerWidth,
+                                             nscoord aCharWidth) const = 0;
+
+  NS_IMETHOD GetFont(nsIPresContext* aPresContext, 
+                    nsFont&         aFont) = 0;
+  /**
+   * Get the content object associated with this frame. Adds a reference to
+   * the content object so the caller must do a release.
+   *
+   * @see nsISupports#Release()
+   */
+  NS_IMETHOD GetFormContent(nsIContent*& aContent) const = 0;
+
 };
 
 #endif

layout/html/forms/public/nsIFormControlFrame.h

@@ -20,11 +20,12 @@
 #define nsIFormControlFrame_h___
 
 #include "nsISupports.h"
-// Forward declarations
+#include "nsFont.h"
 class nsFormFrame;
 class nsIPresContext;
 class nsString;
-class nsIAtom;
+class nsIContent;
+
 
 // IID for the nsIFormControlFrame class
 #define NS_IFORMCONTROLFRAME_IID    \
@@ -44,10 +45,6 @@ public:
 
   NS_IMETHOD GetName(nsString* aName) = 0;
 
-  NS_IMETHOD SetProperty(nsIAtom* aName, const nsString& aValue) = 0; 
-
-  NS_IMETHOD GetProperty(nsIAtom* aName, nsString& aValue) = 0; 
-
   virtual void SetFocus(PRBool aOn = PR_TRUE, PRBool aRepaint = PR_FALSE) = 0;
 
   virtual void MouseClicked(nsIPresContext* aPresContext) = 0;
@@ -62,6 +59,24 @@ public:
                                  nsString* aValues, nsString* aNames) = 0;
 
   virtual void SetFormFrame(nsFormFrame* aFrame) = 0;
+
+  virtual nscoord GetVerticalInsidePadding(float aPixToTwip,
+                                           nscoord aInnerHeight) const = 0;
+  virtual nscoord GetHorizontalInsidePadding(nsIPresContext& aPresContext,
+                                             float aPixToTwip, 
+                                             nscoord aInnerWidth,
+                                             nscoord aCharWidth) const = 0;
+
+  NS_IMETHOD GetFont(nsIPresContext* aPresContext, 
+                    nsFont&         aFont) = 0;
+  /**
+   * Get the content object associated with this frame. Adds a reference to
+   * the content object so the caller must do a release.
+   *
+   * @see nsISupports#Release()
+   */
+  NS_IMETHOD GetFormContent(nsIContent*& aContent) const = 0;
+
 };
 
 #endif