Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: Source/core/rendering/RenderMarquee.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMedia.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
76 void suspend(); 76 void suspend();
77 void stop(); 77 void stop();
78 78
79 // FIXME: This function should be private and called at layout time. 79 // FIXME: This function should be private and called at layout time.
80 // However <marquee> tests are very timing dependent so we need to keep the existing timing. 80 // However <marquee> tests are very timing dependent so we need to keep the existing timing.
81 void updateMarqueePosition(); 81 void updateMarqueePosition();
82 82
83 void timerFired(); 83 void timerFired();
84 84
85 private: 85 private:
86 virtual const char* renderName() const OVERRIDE FINAL; 86 virtual const char* renderName() const OVERRIDE;
87 87
88 virtual bool isMarquee() const OVERRIDE FINAL { return true; } 88 virtual bool isMarquee() const OVERRIDE { return true; }
89 89
90 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE FINAL; 90 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
91 91
92 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE FINAL; 92 virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) OVERRIDE;
93 93
94 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 94 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
95 95
96 int m_currentLoop; 96 int m_currentLoop;
97 int m_totalLoops; 97 int m_totalLoops;
98 Timer<HTMLMarqueeElement> m_timer; 98 Timer<HTMLMarqueeElement> m_timer;
99 int m_start; 99 int m_start;
100 int m_end; 100 int m_end;
101 int m_speed; 101 int m_speed;
102 Length m_height; 102 Length m_height;
103 bool m_reset: 1; 103 bool m_reset: 1;
104 bool m_suspended : 1; 104 bool m_suspended : 1;
105 bool m_stopped : 1; 105 bool m_stopped : 1;
106 EMarqueeDirection m_direction : 4; 106 EMarqueeDirection m_direction : 4;
107 }; 107 };
108 108
109 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMarquee, isMarquee()); 109 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMarquee, isMarquee());
110 110
111 } // namespace WebCore 111 } // namespace WebCore
112 112
113 #endif // RenderMarquee_h 113 #endif // RenderMarquee_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.h ('k') | Source/core/rendering/RenderMedia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698