Backing out to fix bustage.

layout/base/nsCSSFrameConstructor.cpp

@@ -107,7 +107,7 @@ static NS_DEFINE_CID(kAttributeContentCID, NS_ATTRIBUTECONTENT_CID);
 #include "nsInlineFrame.h"
 #include "nsBlockFrame.h"
 
-#include "nsFormControlHelper.h"
+#include "nsGfxTextControlFrame.h"
 #include "nsIScrollableFrame.h"
 
 #include "nsIServiceManager.h"
@@ -4098,6 +4098,12 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell*        aPresShell
     if (NS_FAILED(rv)) {
       aNewFrame = nsnull;
     }
+    if (aNewFrame)
+    {
+#ifndef ENDER_LITE
+      ((nsGfxTextControlFrame*)aNewFrame)->SetFrameConstructor(this);
+#endif
+    }
   }
   if (!aNewFrame)
   {

layout/forms/nsFileControlFrame.h

@@ -31,9 +31,14 @@
 #include "nsCOMPtr.h"
 #include "nsIHTMLContent.h"
 
+#ifndef ENDER_LITE
+#include "nsGfxTextControlFrame.h"
+typedef   nsGfxTextControlFrame nsNewFrame;
+#else
 #include "nsGfxTextControlFrame2.h"
 #include "nsFormControlHelper.h"
 typedef   nsGfxTextControlFrame2 nsNewFrame;
+#endif
 
 class nsIPresState;
 class nsFormFrame;

layout/forms/nsIsIndexFrame.h

@@ -30,9 +30,14 @@
 #include "nsIUnicodeEncoder.h"
 #include "nsIDOMKeyListener.h"
 
+#ifndef ENDER_LITE
+#include "nsGfxTextControlFrame.h"
+typedef   nsGfxTextControlFrame nsNewFrame;
+#else
 #include "nsGfxTextControlFrame2.h"
 #include "nsFormControlHelper.h"
 typedef   nsGfxTextControlFrame2 nsNewFrame;
+#endif
 
 class nsIPresState;
 class nsISupportsArray;

layout/html/forms/src/nsFileControlFrame.h

@@ -31,9 +31,14 @@
 #include "nsCOMPtr.h"
 #include "nsIHTMLContent.h"
 
+#ifndef ENDER_LITE
+#include "nsGfxTextControlFrame.h"
+typedef   nsGfxTextControlFrame nsNewFrame;
+#else
 #include "nsGfxTextControlFrame2.h"
 #include "nsFormControlHelper.h"
 typedef   nsGfxTextControlFrame2 nsNewFrame;
+#endif
 
 class nsIPresState;
 class nsFormFrame;

layout/html/forms/src/nsGfxTextControlFrame2.cpp

@@ -3080,7 +3080,7 @@ nsGfxTextControlFrame2::SetTextControlFrameState(const nsAReadableString& aValue
       else {
         nsCOMPtr<nsIPlaintextEditor> textEditor = do_QueryInterface(mEditor);
         if (textEditor)
-          textEditor->InsertText(currentValue);
+          textEditor->InsertText(currentValue.GetUnicode());
       }
       mEditor->SetFlags(savedFlags);
       if (selPriv)

layout/html/forms/src/nsIsIndexFrame.h

@@ -30,9 +30,14 @@
 #include "nsIUnicodeEncoder.h"
 #include "nsIDOMKeyListener.h"
 
+#ifndef ENDER_LITE
+#include "nsGfxTextControlFrame.h"
+typedef   nsGfxTextControlFrame nsNewFrame;
+#else
 #include "nsGfxTextControlFrame2.h"
 #include "nsFormControlHelper.h"
 typedef   nsGfxTextControlFrame2 nsNewFrame;
+#endif
 
 class nsIPresState;
 class nsISupportsArray;

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -107,7 +107,7 @@ static NS_DEFINE_CID(kAttributeContentCID, NS_ATTRIBUTECONTENT_CID);
 #include "nsInlineFrame.h"
 #include "nsBlockFrame.h"
 
-#include "nsFormControlHelper.h"
+#include "nsGfxTextControlFrame.h"
 #include "nsIScrollableFrame.h"
 
 #include "nsIServiceManager.h"
@@ -4098,6 +4098,12 @@ nsCSSFrameConstructor::ConstructTextControlFrame(nsIPresShell*        aPresShell
     if (NS_FAILED(rv)) {
       aNewFrame = nsnull;
     }
+    if (aNewFrame)
+    {
+#ifndef ENDER_LITE
+      ((nsGfxTextControlFrame*)aNewFrame)->SetFrameConstructor(this);
+#endif
+    }
   }
   if (!aNewFrame)
   {