webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 15 insertions, 20 deletions

diff --git a/Source/WebCore/html/HTMLOutputElement.h b/Source/WebCore/html/HTMLOutputElement.h
index 9c4166132..03d49982d 100644
--- a/Source/WebCore/html/HTMLOutputElement.h
+++ b/Source/WebCore/html/HTMLOutputElement.h
@@ -28,48 +28,43 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef HTMLOutputElement_h
-#define HTMLOutputElement_h
+#pragma once
 
-#include "DOMSettableTokenList.h"
+#include "DOMTokenList.h"
 #include "HTMLFormControlElement.h"
 
 namespace WebCore {
 
 class HTMLOutputElement final : public HTMLFormControlElement {
 public:
-    static PassRefPtr<HTMLOutputElement> create(const QualifiedName&, Document&, HTMLFormElement*);
-
-    virtual bool willValidate() const override { return false; }
+    static Ref<HTMLOutputElement> create(const QualifiedName&, Document&, HTMLFormElement*);
 
     String value() const;
     void setValue(const String&);
     String defaultValue() const;
     void setDefaultValue(const String&);
-    void setFor(const String&);
-    DOMSettableTokenList* htmlFor() const;
+    DOMTokenList& htmlFor();
     
-    virtual bool canContainRangeEndPoint() const override { return false; }
+    bool canContainRangeEndPoint() const final { return false; }
 
 private:
     HTMLOutputElement(const QualifiedName&, Document&, HTMLFormElement*);
 
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
-    virtual const AtomicString& formControlType() const override;
-    virtual bool isEnumeratable() const override { return true; }
-    virtual bool supportLabels() const override { return true; }
-    virtual bool supportsFocus() const override;
-    virtual void childrenChanged(const ChildChange&) override;
-    virtual void reset() override;
+    bool computeWillValidate() const final { return false; }
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
+    const AtomicString& formControlType() const final;
+    bool isEnumeratable() const final { return true; }
+    bool supportLabels() const final { return true; }
+    bool supportsFocus() const final;
+    void childrenChanged(const ChildChange&) final;
+    void reset() final;
 
     void setTextContentInternal(const String&);
 
     bool m_isDefaultValueMode;
     bool m_isSetTextContentInProgress;
     String m_defaultValue;
-    RefPtr<DOMSettableTokenList> m_tokens;
+    std::unique_ptr<DOMTokenList> m_tokens;
 };
 
-} // namespace
-
-#endif
+} // namespace WebCore