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

Side by Side Diff: Source/core/html/track/TextTrack.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/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrackCue.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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 public: 50 public:
51 static PassRefPtrWillBeRawPtr<TextTrack> create(const AtomicString& kind, co nst AtomicString& label, const AtomicString& language) 51 static PassRefPtrWillBeRawPtr<TextTrack> create(const AtomicString& kind, co nst AtomicString& label, const AtomicString& language)
52 { 52 {
53 return adoptRefWillBeNoop(new TextTrack(kind, label, language, emptyAtom , AddTrack)); 53 return adoptRefWillBeNoop(new TextTrack(kind, label, language, emptyAtom , AddTrack));
54 } 54 }
55 virtual ~TextTrack(); 55 virtual ~TextTrack();
56 56
57 virtual void setTrackList(TextTrackList*); 57 virtual void setTrackList(TextTrackList*);
58 TextTrackList* trackList() { return m_trackList; } 58 TextTrackList* trackList() { return m_trackList; }
59 59
60 virtual void setKind(const AtomicString&) OVERRIDE; 60 virtual void setKind(const AtomicString&) override;
61 61
62 static const AtomicString& subtitlesKeyword(); 62 static const AtomicString& subtitlesKeyword();
63 static const AtomicString& captionsKeyword(); 63 static const AtomicString& captionsKeyword();
64 static const AtomicString& descriptionsKeyword(); 64 static const AtomicString& descriptionsKeyword();
65 static const AtomicString& chaptersKeyword(); 65 static const AtomicString& chaptersKeyword();
66 static const AtomicString& metadataKeyword(); 66 static const AtomicString& metadataKeyword();
67 static bool isValidKindKeyword(const AtomicString&); 67 static bool isValidKindKeyword(const AtomicString&);
68 68
69 static const AtomicString& disabledKeyword(); 69 static const AtomicString& disabledKeyword();
70 static const AtomicString& hiddenKeyword(); 70 static const AtomicString& hiddenKeyword();
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 bool hasBeenConfigured() const { return m_hasBeenConfigured; } 107 bool hasBeenConfigured() const { return m_hasBeenConfigured; }
108 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; } 108 void setHasBeenConfigured(bool flag) { m_hasBeenConfigured = flag; }
109 109
110 virtual bool isDefault() const { return false; } 110 virtual bool isDefault() const { return false; }
111 virtual void setIsDefault(bool) { } 111 virtual void setIsDefault(bool) { }
112 112
113 void removeAllCues(); 113 void removeAllCues();
114 114
115 // EventTarget methods 115 // EventTarget methods
116 virtual const AtomicString& interfaceName() const OVERRIDE; 116 virtual const AtomicString& interfaceName() const override;
117 virtual ExecutionContext* executionContext() const OVERRIDE; 117 virtual ExecutionContext* executionContext() const override;
118 118
119 virtual void trace(Visitor*) OVERRIDE; 119 virtual void trace(Visitor*) override;
120 120
121 protected: 121 protected:
122 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType); 122 TextTrack(const AtomicString& kind, const AtomicString& label, const AtomicS tring& language, const AtomicString& id, TextTrackType);
123 123
124 virtual bool isValidKind(const AtomicString& kind) const OVERRIDE { return i sValidKindKeyword(kind); } 124 virtual bool isValidKind(const AtomicString& kind) const override { return i sValidKindKeyword(kind); }
125 virtual AtomicString defaultKind() const OVERRIDE { return subtitlesKeyword( ); } 125 virtual AtomicString defaultKind() const override { return subtitlesKeyword( ); }
126 126
127 RefPtrWillBeMember<TextTrackCueList> m_cues; 127 RefPtrWillBeMember<TextTrackCueList> m_cues;
128 128
129 private: 129 private:
130 VTTRegionList* ensureVTTRegionList(); 130 VTTRegionList* ensureVTTRegionList();
131 RefPtrWillBeMember<VTTRegionList> m_regions; 131 RefPtrWillBeMember<VTTRegionList> m_regions;
132 132
133 TextTrackCueList* ensureTextTrackCueList(); 133 TextTrackCueList* ensureTextTrackCueList();
134 134
135 RawPtrWillBeMember<TextTrackList> m_trackList; 135 RawPtrWillBeMember<TextTrackList> m_trackList;
136 AtomicString m_mode; 136 AtomicString m_mode;
137 TextTrackType m_trackType; 137 TextTrackType m_trackType;
138 ReadinessState m_readinessState; 138 ReadinessState m_readinessState;
139 int m_trackIndex; 139 int m_trackIndex;
140 int m_renderedTrackIndex; 140 int m_renderedTrackIndex;
141 bool m_hasBeenConfigured; 141 bool m_hasBeenConfigured;
142 }; 142 };
143 143
144 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack); 144 DEFINE_TRACK_TYPE_CASTS(TextTrack, TrackBase::TextTrack);
145 145
146 } // namespace blink 146 } // namespace blink
147 147
148 #endif // TextTrack_h 148 #endif // TextTrack_h
OLDNEW
« no previous file with comments | « Source/core/html/track/LoadableTextTrack.h ('k') | Source/core/html/track/TextTrackCue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698