Merge 124556

Source/WebCore/rendering/RenderSlider.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 21 matching lines @@
     class RenderSlider : public RenderBlock {
     public:
         RenderSlider(HTMLInputElement*);
         virtual ~RenderSlider();
 
         bool inDragMode() const;
 
     private:
         virtual const char* renderName() const { return "RenderSlider"; }
         virtual bool isSlider() const { return true; }
+        virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
 
         virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
         virtual void computePreferredLogicalWidths();
         virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
         virtual void layout();
     };
 
     inline RenderSlider* toRenderSlider(RenderObject* object)
     {
         ASSERT(!object || object->isSlider());
         return static_cast<RenderSlider*>(object);
     }
 
     // This will catch anyone doing an unnecessary cast.
     void toRenderSlider(const RenderSlider*);
 
 } // namespace WebCore
 
 #endif // RenderSlider_h