Bug 473390 part 6. Move the flag-setting for file controls out of the frame constructor and into the frame implementation. r+sr=roc

layout/base/nsCSSFrameConstructor.cpp

@@ -2232,15 +2232,7 @@ nsCSSFrameConstructor::CreateInputFrame(nsFrameConstructorState& aState,
     case NS_FORM_INPUT_FILE:
     {
       *aFrame = NS_NewFileControlFrame(mPresShell, aStyleContext);
-
-      if (*aFrame) {
-        // The (block-like) file control frame should have a float manager
-        (*aFrame)->AddStateBits(NS_BLOCK_FLOAT_MGR);
-        return NS_OK;
-      }
-      else {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
+      return *aFrame ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
     }
 
     case NS_FORM_INPUT_HIDDEN:

layout/forms/nsFileControlFrame.cpp

@@ -92,6 +92,7 @@ nsFileControlFrame::nsFileControlFrame(nsStyleContext* aContext):
   mTextFrame(nsnull), 
   mCachedState(nsnull)
 {
+  AddStateBits(NS_BLOCK_FLOAT_MGR);
 }
 
 nsFileControlFrame::~nsFileControlFrame()