webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 16 deletions

diff --git a/Source/WebCore/rendering/RenderSlider.h b/Source/WebCore/rendering/RenderSlider.h
index d1b0375d5..038c8401e 100644
--- a/Source/WebCore/rendering/RenderSlider.h
+++ b/Source/WebCore/rendering/RenderSlider.h
@@ -18,8 +18,7 @@
  *
  */
 
-#ifndef RenderSlider_h
-#define RenderSlider_h
+#pragma once
 
 #include "RenderFlexibleBox.h"
 
@@ -27,13 +26,12 @@ namespace WebCore {
 
 class HTMLInputElement;
 class MouseEvent;
-class SliderThumbElement;
 
 class RenderSlider final : public RenderFlexibleBox {
 public:
     static const int defaultTrackLength;
 
-    RenderSlider(HTMLInputElement&, PassRef<RenderStyle>);
+    RenderSlider(HTMLInputElement&, RenderStyle&&);
     virtual ~RenderSlider();
 
     HTMLInputElement& element() const;
@@ -41,19 +39,17 @@ public:
     bool inDragMode() const;
 
 private:
-    virtual const char* renderName() const override { return "RenderSlider"; }
-    virtual bool isSlider() const override { return true; }
-    virtual bool canBeReplacedWithInlineRunIn() const override;
-
-    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
-    virtual void computePreferredLogicalWidths() override;
-    virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
-    virtual void layout() override;
-};
+    const char* renderName() const override { return "RenderSlider"; }
+    bool isSlider() const override { return true; }
+
+    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
+    void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
+    void computePreferredLogicalWidths() override;
+    void layout() override;
 
-RENDER_OBJECT_TYPE_CASTS(RenderSlider, isSlider())
+    bool isFlexibleBoxImpl() const override { return true; }
+};
 
 } // namespace WebCore
 
-#endif // RenderSlider_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSlider, isSlider())