| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Apple Computer, Inc. | 2 * Copyright (C) 2003 Apple Computer, Inc. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
| 9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 // FIXME: This function should be private and called at layout time. | 77 // FIXME: This function should be private and called at layout time. |
| 78 // However <marquee> tests are very timing dependent so we need to keep the
existing timing. | 78 // However <marquee> tests are very timing dependent so we need to keep the
existing timing. |
| 79 void updateMarqueePosition(); | 79 void updateMarqueePosition(); |
| 80 | 80 |
| 81 void timerFired(); | 81 void timerFired(); |
| 82 | 82 |
| 83 private: | 83 private: |
| 84 virtual const char* renderName() const OVERRIDE; | 84 virtual const char* renderName() const OVERRIDE; |
| 85 | 85 |
| 86 virtual bool isMarquee() const OVERRIDE { return true; } | 86 virtual bool isOfType(RenderObjectType type) const OVERRIDE { return type ==
RenderObjectMarquee || RenderBlockFlow::isOfType(type); } |
| 87 | 87 |
| 88 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV
ERRIDE; | 88 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV
ERRIDE; |
| 89 | 89 |
| 90 virtual void layoutBlock(bool relayoutChildren) OVERRIDE; | 90 virtual void layoutBlock(bool relayoutChildren) OVERRIDE; |
| 91 | 91 |
| 92 int m_currentLoop; | 92 int m_currentLoop; |
| 93 int m_totalLoops; | 93 int m_totalLoops; |
| 94 Timer<HTMLMarqueeElement> m_timer; | 94 Timer<HTMLMarqueeElement> m_timer; |
| 95 int m_start; | 95 int m_start; |
| 96 int m_end; | 96 int m_end; |
| 97 int m_speed; | 97 int m_speed; |
| 98 Length m_height; | 98 Length m_height; |
| 99 bool m_reset: 1; | 99 bool m_reset: 1; |
| 100 bool m_suspended : 1; | 100 bool m_suspended : 1; |
| 101 bool m_stopped : 1; | 101 bool m_stopped : 1; |
| 102 EMarqueeDirection m_direction : 4; | 102 EMarqueeDirection m_direction : 4; |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMarquee, isMarquee()); | 105 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMarquee, isMarquee()); |
| 106 | 106 |
| 107 } // namespace blink | 107 } // namespace blink |
| 108 | 108 |
| 109 #endif // RenderMarquee_h | 109 #endif // RenderMarquee_h |
| OLD | NEW |