webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 18 deletions

diff --git a/Source/WebCore/rendering/RenderProgress.h b/Source/WebCore/rendering/RenderProgress.h
index e3b53ea2c..3a6d84d83 100644
--- a/Source/WebCore/rendering/RenderProgress.h
+++ b/Source/WebCore/rendering/RenderProgress.h
@@ -18,10 +18,8 @@
  *
  */
 
-#ifndef RenderProgress_h
-#define RenderProgress_h
+#pragma once
 
-#if ENABLE(PROGRESS_ELEMENT)
 #include "RenderBlockFlow.h"
 
 namespace WebCore {
@@ -30,7 +28,7 @@ class HTMLProgressElement;
 
 class RenderProgress final : public RenderBlockFlow {
 public:
-    RenderProgress(HTMLElement&, PassRef<RenderStyle>);
+    RenderProgress(HTMLElement&, RenderStyle&&);
     virtual ~RenderProgress();
 
     double position() const { return m_position; }
@@ -38,18 +36,16 @@ public:
     double animationStartTime() const { return m_animationStartTime; }
 
     bool isDeterminate() const;
-    virtual void updateFromElement() override;
+    void updateFromElement() override;
 
     HTMLProgressElement* progressElement() const;
 
 private:
-    virtual const char* renderName() const override { return "RenderProgress"; }
-    virtual bool isProgress() const override { return true; }
-    virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
-    virtual bool canBeReplacedWithInlineRunIn() const override;
-    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
+    const char* renderName() const override { return "RenderProgress"; }
+    bool isProgress() const override { return true; }
+    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
 
-    void animationTimerFired(Timer<RenderProgress>&);
+    void animationTimerFired();
     void updateAnimationState();
 
     double m_position;
@@ -57,14 +53,9 @@ private:
     double m_animationRepeatInterval;
     double m_animationDuration;
     bool m_animating;
-    Timer<RenderProgress> m_animationTimer;
+    Timer m_animationTimer;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderProgress, isProgress())
-
 } // namespace WebCore
 
-#endif
-
-#endif // RenderProgress_h
-
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderProgress, isProgress())