webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 15 deletions

diff --git a/Source/WebCore/rendering/RenderMeter.h b/Source/WebCore/rendering/RenderMeter.h
index 80f333f80..92e0a5cb0 100644
--- a/Source/WebCore/rendering/RenderMeter.h
+++ b/Source/WebCore/rendering/RenderMeter.h
@@ -18,40 +18,35 @@
  *
  */
 
-#ifndef RenderMeter_h
-#define RenderMeter_h
+#pragma once
 
 #if ENABLE(METER_ELEMENT)
+
 #include "RenderBlockFlow.h"
 #include "RenderWidget.h"
 
-
 namespace WebCore {
 
 class HTMLMeterElement;
 
 class RenderMeter final : public RenderBlockFlow {
 public:
-    RenderMeter(HTMLElement&, PassRef<RenderStyle>);
+    RenderMeter(HTMLElement&, RenderStyle&&);
     virtual ~RenderMeter();
 
     HTMLMeterElement* meterElement() const;
-    virtual void updateFromElement() override;
+    void updateFromElement() override;
 
 private:
-    virtual void updateLogicalWidth() override;
-    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
+    void updateLogicalWidth() override;
+    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
 
-    virtual const char* renderName() const override { return "RenderMeter"; }
-    virtual bool isMeter() const override { return true; }
-    virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
+    const char* renderName() const override { return "RenderMeter"; }
+    bool isMeter() const override { return true; }
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderMeter, isMeter())
-
 } // namespace WebCore
 
-#endif
-
-#endif // RenderMeter_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMeter, isMeter())
 
+#endif // ENABLE(METER_ELEMENT)