Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 33 insertions, 31 deletions

diff --git a/Source/WebCore/rendering/RenderSlider.h b/Source/WebCore/rendering/RenderSlider.h
index ebd0bd856..181ed915f 100644
--- a/Source/WebCore/rendering/RenderSlider.h
+++ b/Source/WebCore/rendering/RenderSlider.h
@@ -21,40 +21,42 @@
 #ifndef RenderSlider_h
 #define RenderSlider_h
 
-#include "RenderBlock.h"
+#include "RenderFlexibleBox.h"
 
 namespace WebCore {
 
-    class HTMLInputElement;
-    class MouseEvent;
-    class SliderThumbElement;
-    
-    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*);
+class HTMLInputElement;
+class MouseEvent;
+class SliderThumbElement;
+
+class RenderSlider : public RenderFlexibleBox {
+public:
+    static const int defaultTrackLength;
+
+    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