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

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

Issue 1219013005: Fix virtual/override/final usage in Source/core/html/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrackContainer.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) 2011, 2012, 2013 Apple Inc. All rights reserved. 3 * Copyright (C) 2011, 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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 class CORE_EXPORT TextTrack : public EventTargetWithInlineData, public TrackBase { 48 class CORE_EXPORT TextTrack : public EventTargetWithInlineData, public TrackBase {
49 DEFINE_WRAPPERTYPEINFO(); 49 DEFINE_WRAPPERTYPEINFO();
50 REFCOUNTED_EVENT_TARGET(TrackBase); 50 REFCOUNTED_EVENT_TARGET(TrackBase);
51 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(TextTrack); 51 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(TextTrack);
52 public: 52 public:
53 static PassRefPtrWillBeRawPtr<TextTrack> create(const AtomicString& kind, co nst AtomicString& label, const AtomicString& language) 53 static PassRefPtrWillBeRawPtr<TextTrack> create(const AtomicString& kind, co nst AtomicString& label, const AtomicString& language)
54 { 54 {
55 return adoptRefWillBeNoop(new TextTrack(kind, label, language, emptyAtom , AddTrack)); 55 return adoptRefWillBeNoop(new TextTrack(kind, label, language, emptyAtom , AddTrack));
56 } 56 }
57 virtual ~TextTrack(); 57 ~TextTrack() override;
58 58
59 virtual void setTrackList(TextTrackList*); 59 virtual void setTrackList(TextTrackList*);
60 TextTrackList* trackList() { return m_trackList; } 60 TextTrackList* trackList() { return m_trackList; }
61 61
62 virtual void setKind(const AtomicString&) override; 62 void setKind(const AtomicString&) override;
63 63
64 static const AtomicString& subtitlesKeyword(); 64 static const AtomicString& subtitlesKeyword();
65 static const AtomicString& captionsKeyword(); 65 static const AtomicString& captionsKeyword();
66 static const AtomicString& descriptionsKeyword(); 66 static const AtomicString& descriptionsKeyword();
67 static const AtomicString& chaptersKeyword(); 67 static const AtomicString& chaptersKeyword();
68 static const AtomicString& metadataKeyword(); 68 static const AtomicString& metadataKeyword();
69 static bool isValidKindKeyword(const String&); 69 static bool isValidKindKeyword(const String&);
70 70
71 static const AtomicString& disabledKeyword(); 71 static const AtomicString& disabledKeyword();
72 static const AtomicString& hiddenKeyword(); 72 static const AtomicString& hiddenKeyword();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 int trackIndexRelativeToRenderedTracks(); 107 int trackIndexRelativeToRenderedTracks();
108 108
109 bool hasBeenConfigured() const { return m_hasBeenConfigured; } 109 bool hasBeenConfigured() const { return m_hasBeenConfigured; }
110 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; } 110 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; }
111 111
112 virtual bool isDefault() const { return false; } 112 virtual bool isDefault() const { return false; }
113 113
114 void removeAllCues(); 114 void removeAllCues();
115 115
116 // EventTarget methods 116 // EventTarget methods
117 virtual const AtomicString& interfaceName() const override; 117 const AtomicString& interfaceName() const override;
118 virtual ExecutionContext* executionContext() const override; 118 ExecutionContext* executionContext() const override;
119 119
120 DECLARE_VIRTUAL_TRACE(); 120 DECLARE_VIRTUAL_TRACE();
121 121
122 protected: 122 protected:
123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType); 123 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType);
124 124
125 virtual bool isValidKind(const AtomicString& kind) const override { return i sValidKindKeyword(kind); } 125 bool isValidKind(const AtomicString& kind) const override { return isValidKi ndKeyword(kind); }
126 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); } 126 AtomicString defaultKind() const override { return subtitlesKeyword(); }
127 127
128 void addListOfCues(WillBeHeapVector<RefPtrWillBeMember<TextTrackCue>>&); 128 void addListOfCues(WillBeHeapVector<RefPtrWillBeMember<TextTrackCue>>&);
129 129
130 private: 130 private:
131 CueTimeline* cueTimeline() const; 131 CueTimeline* cueTimeline() const;
132 132
133 TextTrackCueList* ensureTextTrackCueList(); 133 TextTrackCueList* ensureTextTrackCueList();
134 RefPtrWillBeMember<TextTrackCueList> m_cues; 134 RefPtrWillBeMember<TextTrackCueList> m_cues;
135 RefPtrWillBeMember<TextTrackCueList> m_activeCues; 135 RefPtrWillBeMember<TextTrackCueList> m_activeCues;
136 136
137 VTTRegionList* ensureVTTRegionList(); 137 VTTRegionList* ensureVTTRegionList();
138 RefPtrWillBeMember<VTTRegionList> m_regions; 138 RefPtrWillBeMember<VTTRegionList> m_regions;
139 139
140 RawPtrWillBeMember<TextTrackList> m_trackList; 140 RawPtrWillBeMember<TextTrackList> m_trackList;
141 AtomicString m_mode; 141 AtomicString m_mode;
142 TextTrackType m_trackType; 142 TextTrackType m_trackType;
143 ReadinessState m_readinessState; 143 ReadinessState m_readinessState;
144 int m_trackIndex; 144 int m_trackIndex;
145 int m_renderedTrackIndex; 145 int m_renderedTrackIndex;
146 bool m_hasBeenConfigured; 146 bool m_hasBeenConfigured;
147 }; 147 };
148 148
149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); 149 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);
150 150
151 } // namespace blink 151 } // namespace blink
152 152
153 #endif // TextTrack_h 153 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrackContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698