1 files changed, 6 insertions, 9 deletions
diff --git a/chromium/third_party/WebKit/Source/core/html/HTMLMarqueeElement.h b/chromium/third_party/WebKit/Source/core/html/HTMLMarqueeElement.h
index 9169908586a..90add468471 100644
--- a/chromium/third_party/WebKit/Source/core/html/HTMLMarqueeElement.h
+++ b/chromium/third_party/WebKit/Source/core/html/HTMLMarqueeElement.h
@@ -33,7 +33,7 @@ class RenderMarquee;
 
 class HTMLMarqueeElement FINAL : public HTMLElement, private ActiveDOMObject {
 public:
-    static PassRefPtr<HTMLMarqueeElement> create(const QualifiedName&, Document&);
+    static PassRefPtr<HTMLMarqueeElement> create(Document&);
 
     int minimumDelay() const;
 
@@ -51,15 +51,16 @@ public:
     int loop() const;
     void setLoop(int, ExceptionState&);
 
+    void timerFired(Timer<HTMLMarqueeElement>*);
+
 private:
-    HTMLMarqueeElement(const QualifiedName&, Document&);
+    explicit HTMLMarqueeElement(Document&);
 
     virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;
     virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStylePropertySet*) OVERRIDE;
 
     // ActiveDOMObject
-    virtual bool canSuspend() const;
-    virtual void suspend(ReasonForSuspension);
+    virtual void suspend();
     virtual void resume();
 
     virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE FINAL;
@@ -67,11 +68,7 @@ private:
     RenderMarquee* renderMarquee() const;
 };
 
-inline HTMLMarqueeElement* toHTMLMarqueeElement(Node* node)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(HTMLNames::marqueeTag));
-    return static_cast<HTMLMarqueeElement*>(node);
-}
+DEFINE_NODE_TYPE_CASTS(HTMLMarqueeElement, hasTagName(HTMLNames::marqueeTag));
 
 } // namespace WebCore