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

Side by Side Diff: Source/core/html/HTMLTrackElement.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/HTMLTitleElement.h ('k') | Source/core/html/HTMLUListElement.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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 28
29 #include "core/html/HTMLElement.h" 29 #include "core/html/HTMLElement.h"
30 #include "core/html/track/LoadableTextTrack.h" 30 #include "core/html/track/LoadableTextTrack.h"
31 #include "core/html/track/TextTrack.h" 31 #include "core/html/track/TextTrack.h"
32 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class HTMLMediaElement; 36 class HTMLMediaElement;
37 37
38 class HTMLTrackElement FINAL : public HTMLElement { 38 class HTMLTrackElement final : public HTMLElement {
39 DEFINE_WRAPPERTYPEINFO(); 39 DEFINE_WRAPPERTYPEINFO();
40 public: 40 public:
41 DECLARE_NODE_FACTORY(HTMLTrackElement); 41 DECLARE_NODE_FACTORY(HTMLTrackElement);
42 42
43 const AtomicString& kind(); 43 const AtomicString& kind();
44 void setKind(const AtomicString&); 44 void setKind(const AtomicString&);
45 45
46 enum ReadyState { NONE = 0, LOADING = 1, LOADED = 2, TRACK_ERROR = 3 }; 46 enum ReadyState { NONE = 0, LOADING = 1, LOADED = 2, TRACK_ERROR = 3 };
47 ReadyState readyState(); 47 ReadyState readyState();
48 void setReadyState(ReadyState); 48 void setReadyState(ReadyState);
49 49
50 TextTrack* track(); 50 TextTrack* track();
51 51
52 void scheduleLoad(); 52 void scheduleLoad();
53 53
54 enum LoadStatus { Failure, Success }; 54 enum LoadStatus { Failure, Success };
55 void didCompleteLoad(LoadStatus); 55 void didCompleteLoad(LoadStatus);
56 56
57 const AtomicString& mediaElementCrossOriginAttribute() const; 57 const AtomicString& mediaElementCrossOriginAttribute() const;
58 58
59 virtual void trace(Visitor*) OVERRIDE; 59 virtual void trace(Visitor*) override;
60 60
61 private: 61 private:
62 explicit HTMLTrackElement(Document&); 62 explicit HTMLTrackElement(Document&);
63 virtual ~HTMLTrackElement(); 63 virtual ~HTMLTrackElement();
64 64
65 virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERR IDE; 65 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
66 66
67 virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE; 67 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
68 68
69 virtual void removedFrom(ContainerNode*) OVERRIDE; 69 virtual void removedFrom(ContainerNode*) override;
70 virtual bool isURLAttribute(const Attribute&) const OVERRIDE; 70 virtual bool isURLAttribute(const Attribute&) const override;
71 71
72 void loadTimerFired(Timer<HTMLTrackElement>*); 72 void loadTimerFired(Timer<HTMLTrackElement>*);
73 73
74 HTMLMediaElement* mediaElement() const; 74 HTMLMediaElement* mediaElement() const;
75 75
76 LoadableTextTrack* ensureTrack(); 76 LoadableTextTrack* ensureTrack();
77 bool canLoadUrl(const KURL&); 77 bool canLoadUrl(const KURL&);
78 78
79 RefPtrWillBeMember<LoadableTextTrack> m_track; 79 RefPtrWillBeMember<LoadableTextTrack> m_track;
80 Timer<HTMLTrackElement> m_loadTimer; 80 Timer<HTMLTrackElement> m_loadTimer;
81 }; 81 };
82 82
83 } // namespace blink 83 } // namespace blink
84 84
85 #endif // HTMLTrackElement_h 85 #endif // HTMLTrackElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLTitleElement.h ('k') | Source/core/html/HTMLUListElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698