Merge 124556

Source/WebCore/rendering/RenderFileUploadControl.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
     virtual ~RenderFileUploadControl();
 
     virtual bool isFileUploadControl() const { return true; }
 
     String buttonValue();
     String fileTextValue() const;
     
 private:
     virtual const char* renderName() const { return "RenderFileUploadControl"; }
 
+    virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     virtual void updateFromElement();
     virtual void computePreferredLogicalWidths();
     virtual void paintObject(PaintInfo&, const LayoutPoint&);
 
     virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
 
     int maxFilenameWidth() const;
     
     virtual VisiblePosition positionForPoint(const LayoutPoint&);
 
@@ skipping 13 matching lines @@
     ASSERT(!object || object->isFileUploadControl());
     return static_cast<const RenderFileUploadControl*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderFileUploadControl(const RenderFileUploadControl*);
 
 } // namespace WebCore
 
 #endif // RenderFileUploadControl_h