webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 19 insertions, 23 deletions

diff --git a/Source/WebCore/html/HTMLMarqueeElement.h b/Source/WebCore/html/HTMLMarqueeElement.h
index d10982b1d..13b147267 100644
--- a/Source/WebCore/html/HTMLMarqueeElement.h
+++ b/Source/WebCore/html/HTMLMarqueeElement.h
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef HTMLMarqueeElement_h
-#define HTMLMarqueeElement_h
+#pragma once
 
 #include "ActiveDOMObject.h"
 #include "HTMLElement.h"
@@ -32,40 +31,37 @@ class RenderMarquee;
 
 class HTMLMarqueeElement final : public HTMLElement, private ActiveDOMObject {
 public:
-    static PassRefPtr<HTMLMarqueeElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLMarqueeElement> create(const QualifiedName&, Document&);
 
     int minimumDelay() const;
 
-    // DOM Functions
-
-    void start();
-    void stop() override;
+    WEBCORE_EXPORT void start();
+    WEBCORE_EXPORT void stop() final;
     
-    int scrollAmount() const;
-    void setScrollAmount(int, ExceptionCode&);
+    // Number of pixels to move on each scroll movement. Defaults to 6.
+    WEBCORE_EXPORT unsigned scrollAmount() const;
+    WEBCORE_EXPORT void setScrollAmount(unsigned);
     
-    int scrollDelay() const;
-    void setScrollDelay(int, ExceptionCode&);
+    // Interval between each scroll movement, in milliseconds. Defaults to 60.
+    WEBCORE_EXPORT unsigned scrollDelay() const;
+    WEBCORE_EXPORT void setScrollDelay(unsigned);
     
-    int loop() const;
-    void setLoop(int, ExceptionCode&);
+    // Loop count. -1 means loop indefinitely.
+    WEBCORE_EXPORT int loop() const;
+    WEBCORE_EXPORT ExceptionOr<void> setLoop(int);
     
 private:
     HTMLMarqueeElement(const QualifiedName&, Document&);
 
-    virtual bool isPresentationAttribute(const QualifiedName&) const override;
-    virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
+    bool isPresentationAttribute(const QualifiedName&) const final;
+    void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final;
 
-    // ActiveDOMObject
-    virtual bool canSuspend() const override;
-    virtual void suspend(ReasonForSuspension) override;
-    virtual void resume() override;
+    bool canSuspendForDocumentSuspension() const final;
+    void suspend(ReasonForSuspension) final;
+    void resume() final;
+    const char* activeDOMObjectName() const final { return "HTMLMarqueeElement"; }
 
     RenderMarquee* renderMarquee() const;
 };
 
-NODE_TYPE_CASTS(HTMLMarqueeElement)
-
 } // namespace WebCore
-
-#endif // HTMLMarqueeElement_h