webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 21 deletions

diff --git a/Source/WebCore/html/HTMLProgressElement.h b/Source/WebCore/html/HTMLProgressElement.h
index 255563d22..bd33aa122 100644
--- a/Source/WebCore/html/HTMLProgressElement.h
+++ b/Source/WebCore/html/HTMLProgressElement.h
@@ -18,10 +18,8 @@
  *
  */
 
-#ifndef HTMLProgressElement_h
-#define HTMLProgressElement_h
+#pragma once
 
-#if ENABLE(PROGRESS_ELEMENT)
 #include "LabelableElement.h"
 
 namespace WebCore {
@@ -34,44 +32,38 @@ public:
     static const double IndeterminatePosition;
     static const double InvalidPosition;
 
-    static PassRefPtr<HTMLProgressElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLProgressElement> create(const QualifiedName&, Document&);
 
     double value() const;
-    void setValue(double, ExceptionCode&);
+    void setValue(double);
 
     double max() const;
-    void setMax(double, ExceptionCode&);
+    void setMax(double);
 
     double position() const;
 
-    virtual bool canContainRangeEndPoint() const override { return false; }
-
 private:
     HTMLProgressElement(const QualifiedName&, Document&);
     virtual ~HTMLProgressElement();
 
-    virtual bool areAuthorShadowsAllowed() const override { return false; }
-    virtual bool shouldAppearIndeterminate() const override;
-    virtual bool supportLabels() const override { return true; }
+    bool shouldAppearIndeterminate() const final;
+    bool supportLabels() const final { return true; }
 
-    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
-    virtual bool childShouldCreateRenderer(const Node&) const override;
+    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+    bool childShouldCreateRenderer(const Node&) const final;
     RenderProgress* renderProgress() const;
 
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
 
-    virtual void didAttachRenderers() override;
+    void didAttachRenderers() final;
 
     void didElementStateChange();
-    virtual void didAddUserAgentShadowRoot(ShadowRoot*) override;
+    void didAddUserAgentShadowRoot(ShadowRoot*) final;
     bool isDeterminate() const;
 
+    bool canContainRangeEndPoint() const final { return false; }
+
     ProgressValueElement* m_value;
 };
 
-NODE_TYPE_CASTS(HTMLProgressElement)
-
 } // namespace
-
-#endif
-#endif