webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 18 insertions, 23 deletions

diff --git a/Source/WebCore/html/HTMLMeterElement.h b/Source/WebCore/html/HTMLMeterElement.h
index e16ff3dd0..604a65a9e 100644
--- a/Source/WebCore/html/HTMLMeterElement.h
+++ b/Source/WebCore/html/HTMLMeterElement.h
@@ -18,10 +18,10 @@
  *
  */
 
-#ifndef HTMLMeterElement_h
-#define HTMLMeterElement_h
+#pragma once
 
 #if ENABLE(METER_ELEMENT)
+
 #include "LabelableElement.h"
 
 namespace WebCore {
@@ -31,7 +31,7 @@ class RenderMeter;
 
 class HTMLMeterElement final : public LabelableElement {
 public:
-    static PassRefPtr<HTMLMeterElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLMeterElement> create(const QualifiedName&, Document&);
 
     enum GaugeRegion {
         GaugeRegionOptimum,
@@ -40,51 +40,46 @@ public:
     };
 
     double min() const;
-    void setMin(double, ExceptionCode&);
+    void setMin(double);
 
     double max() const;
-    void setMax(double, ExceptionCode&);
+    void setMax(double);
 
     double value() const;
-    void setValue(double, ExceptionCode&);
+    void setValue(double);
 
     double low() const;
-    void setLow(double, ExceptionCode&);
+    void setLow(double);
 
     double high() const;
-    void setHigh(double, ExceptionCode&);
+    void setHigh(double);
 
     double optimum() const;
-    void setOptimum(double, ExceptionCode&);
+    void setOptimum(double);
 
     double valueRatio() const;
     GaugeRegion gaugeRegion() const;
 
-    virtual bool canContainRangeEndPoint() const override { return false; }
+    bool canContainRangeEndPoint() const final { return false; }
 
 private:
     HTMLMeterElement(const QualifiedName&, Document&);
     virtual ~HTMLMeterElement();
 
-    virtual bool areAuthorShadowsAllowed() const override { return false; }
     RenderMeter* renderMeter() const;
 
-    virtual bool supportLabels() const override { return true; }
+    bool supportLabels() const final { return true; }
 
-    virtual bool recalcWillValidate() const { return false; }
-    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
-    virtual bool childShouldCreateRenderer(const Node&) const override;
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
+    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+    bool childShouldCreateRenderer(const Node&) const final;
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
 
     void didElementStateChange();
-    virtual void didAddUserAgentShadowRoot(ShadowRoot*) override;
+    void didAddUserAgentShadowRoot(ShadowRoot*) final;
 
-    RefPtr<MeterValueElement> m_value;
+    RefPtr<HTMLElement> m_value;
 };
 
-NODE_TYPE_CASTS(HTMLMeterElement)
-
-} // namespace
+} // namespace WebCore
 
-#endif
-#endif
+#endif // ENABLE(METER_ELEMENT)