Back out the rest of bug 72747 due to Tp regression.

layout/forms/nsTextControlFrame.cpp

@@ -1637,7 +1637,8 @@ nsTextControlFrame::CreateAnonymousContent(nsPresContext* aPresContext,
     // setting -moz-hidden-unscrollable overflow (NS_STYLE_OVERFLOW_CLIP)
     // doesn't paint the caret for some reason.
     const nsStyleDisplay* disp = GetStyleDisplay();
-    if (disp->mOverflow != NS_STYLE_OVERFLOW_VISIBLE &&
+    if (disp->mOverflow != NS_STYLE_OVERFLOW_AUTO &&  // this is the default
+        disp->mOverflow != NS_STYLE_OVERFLOW_VISIBLE &&
         disp->mOverflow != NS_STYLE_OVERFLOW_CLIP) {
       rv = divContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::style,
                                NS_LITERAL_STRING("overflow: inherit;"),
@@ -2996,6 +2997,16 @@ nsTextControlFrame::SetInitialChildList(nsPresContext* aPresContext,
   // than descending from the root frame of the frame hierarchy.
   first->AddStateBits(NS_FRAME_REFLOW_ROOT);
 
+//we must turn off scrollbars for singleline text controls
+  if (IsSingleLineTextControl()) 
+  {
+    nsIScrollableFrame *scrollableFrame = nsnull;
+    if (first)
+      first->QueryInterface(NS_GET_IID(nsIScrollableFrame), (void **) &scrollableFrame);
+    if (scrollableFrame)
+      scrollableFrame->SetScrollbarVisibility(aPresContext,PR_FALSE,PR_FALSE);
+  }
+
   //register keylistener
   nsCOMPtr<nsIDOMEventReceiver> erP;
   if (NS_SUCCEEDED(mContent->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)