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

Side by Side Diff: Source/core/html/track/TextTrackCue.h

Issue 635793002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/html/track/TextTrack.h ('k') | Source/core/html/track/TextTrackCueList.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 double endTime() const { return m_endTime; } 66 double endTime() const { return m_endTime; }
67 void setEndTime(double); 67 void setEndTime(double);
68 68
69 bool pauseOnExit() const { return m_pauseOnExit; } 69 bool pauseOnExit() const { return m_pauseOnExit; }
70 void setPauseOnExit(bool); 70 void setPauseOnExit(bool);
71 71
72 int cueIndex(); 72 int cueIndex();
73 void invalidateCueIndex(); 73 void invalidateCueIndex();
74 74
75 using EventTarget::dispatchEvent; 75 using EventTarget::dispatchEvent;
76 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE; 76 virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override;
77 77
78 bool isActive(); 78 bool isActive();
79 void setIsActive(bool); 79 void setIsActive(bool);
80 80
81 virtual void updateDisplay(const IntSize& videoSize, HTMLDivElement& contain er) = 0; 81 virtual void updateDisplay(const IntSize& videoSize, HTMLDivElement& contain er) = 0;
82 82
83 // FIXME: Consider refactoring to eliminate or merge the following three mem bers. 83 // FIXME: Consider refactoring to eliminate or merge the following three mem bers.
84 // https://code.google.com/p/chromium/issues/detail?id=322434 84 // https://code.google.com/p/chromium/issues/detail?id=322434
85 virtual void updateDisplayTree(double movieTime) = 0; 85 virtual void updateDisplayTree(double movieTime) = 0;
86 virtual void removeDisplayTree() = 0; 86 virtual void removeDisplayTree() = 0;
87 virtual void notifyRegionWhenRemovingDisplayTree(bool notifyRegion) = 0; 87 virtual void notifyRegionWhenRemovingDisplayTree(bool notifyRegion) = 0;
88 88
89 virtual const AtomicString& interfaceName() const OVERRIDE; 89 virtual const AtomicString& interfaceName() const override;
90 90
91 #ifndef NDEBUG 91 #ifndef NDEBUG
92 virtual String toString() const = 0; 92 virtual String toString() const = 0;
93 #endif 93 #endif
94 94
95 DEFINE_ATTRIBUTE_EVENT_LISTENER(enter); 95 DEFINE_ATTRIBUTE_EVENT_LISTENER(enter);
96 DEFINE_ATTRIBUTE_EVENT_LISTENER(exit); 96 DEFINE_ATTRIBUTE_EVENT_LISTENER(exit);
97 97
98 virtual void trace(Visitor*) OVERRIDE; 98 virtual void trace(Visitor*) override;
99 99
100 protected: 100 protected:
101 TextTrackCue(double start, double end); 101 TextTrackCue(double start, double end);
102 102
103 void cueWillChange(); 103 void cueWillChange();
104 virtual void cueDidChange(); 104 virtual void cueDidChange();
105 105
106 private: 106 private:
107 AtomicString m_id; 107 AtomicString m_id;
108 double m_startTime; 108 double m_startTime;
109 double m_endTime; 109 double m_endTime;
110 int m_cueIndex; 110 int m_cueIndex;
111 111
112 RawPtrWillBeMember<TextTrack> m_track; 112 RawPtrWillBeMember<TextTrack> m_track;
113 113
114 bool m_isActive : 1; 114 bool m_isActive : 1;
115 bool m_pauseOnExit : 1; 115 bool m_pauseOnExit : 1;
116 }; 116 };
117 117
118 } // namespace blink 118 } // namespace blink
119 119
120 #endif // TextTrackCue_h 120 #endif // TextTrackCue_h
OLDNEW
« no previous file with comments | « Source/core/html/track/TextTrack.h ('k') | Source/core/html/track/TextTrackCueList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698