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

Side by Side Diff: Source/core/html/track/LoadableTextTrack.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/InbandTextTrack.h ('k') | Source/core/html/track/TextTrack.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 18 matching lines...) Expand all
29 #include "core/html/track/TextTrack.h" 29 #include "core/html/track/TextTrack.h"
30 #include "core/loader/TextTrackLoader.h" 30 #include "core/loader/TextTrackLoader.h"
31 #include "platform/heap/Handle.h" 31 #include "platform/heap/Handle.h"
32 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
33 33
34 namespace blink { 34 namespace blink {
35 35
36 class HTMLTrackElement; 36 class HTMLTrackElement;
37 class LoadableTextTrack; 37 class LoadableTextTrack;
38 38
39 class LoadableTextTrack FINAL : public TextTrack, private TextTrackLoaderClient { 39 class LoadableTextTrack final : public TextTrack, private TextTrackLoaderClient {
40 public: 40 public:
41 static PassRefPtrWillBeRawPtr<LoadableTextTrack> create(HTMLTrackElement* tr ack) 41 static PassRefPtrWillBeRawPtr<LoadableTextTrack> create(HTMLTrackElement* tr ack)
42 { 42 {
43 return adoptRefWillBeNoop(new LoadableTextTrack(track)); 43 return adoptRefWillBeNoop(new LoadableTextTrack(track));
44 } 44 }
45 virtual ~LoadableTextTrack(); 45 virtual ~LoadableTextTrack();
46 46
47 void scheduleLoad(const KURL&); 47 void scheduleLoad(const KURL&);
48 48
49 // TextTrack method. 49 // TextTrack method.
50 virtual void setMode(const AtomicString&) OVERRIDE; 50 virtual void setMode(const AtomicString&) override;
51 51
52 size_t trackElementIndex(); 52 size_t trackElementIndex();
53 HTMLTrackElement* trackElement() { return m_trackElement; } 53 HTMLTrackElement* trackElement() { return m_trackElement; }
54 #if !ENABLE(OILPAN) 54 #if !ENABLE(OILPAN)
55 void clearTrackElement(); 55 void clearTrackElement();
56 #endif 56 #endif
57 57
58 virtual bool isDefault() const OVERRIDE { return m_isDefault; } 58 virtual bool isDefault() const override { return m_isDefault; }
59 virtual void setIsDefault(bool isDefault) OVERRIDE { m_isDefault = isDefaul t; } 59 virtual void setIsDefault(bool isDefault) override { m_isDefault = isDefaul t; }
60 60
61 virtual void trace(Visitor*) OVERRIDE; 61 virtual void trace(Visitor*) override;
62 62
63 private: 63 private:
64 // TextTrackLoaderClient 64 // TextTrackLoaderClient
65 virtual void newCuesAvailable(TextTrackLoader*) OVERRIDE; 65 virtual void newCuesAvailable(TextTrackLoader*) override;
66 virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) OVERR IDE; 66 virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) overr ide;
67 virtual void newRegionsAvailable(TextTrackLoader*) OVERRIDE; 67 virtual void newRegionsAvailable(TextTrackLoader*) override;
68 68
69 explicit LoadableTextTrack(HTMLTrackElement*); 69 explicit LoadableTextTrack(HTMLTrackElement*);
70 70
71 void loadTimerFired(Timer<LoadableTextTrack>*); 71 void loadTimerFired(Timer<LoadableTextTrack>*);
72 72
73 RawPtrWillBeMember<HTMLTrackElement> m_trackElement; 73 RawPtrWillBeMember<HTMLTrackElement> m_trackElement;
74 Timer<LoadableTextTrack> m_loadTimer; 74 Timer<LoadableTextTrack> m_loadTimer;
75 OwnPtrWillBeMember<TextTrackLoader> m_loader; 75 OwnPtrWillBeMember<TextTrackLoader> m_loader;
76 KURL m_url; 76 KURL m_url;
77 bool m_isDefault; 77 bool m_isDefault;
78 }; 78 };
79 } // namespace blink 79 } // namespace blink
80 80
81 #endif 81 #endif
OLDNEW
« no previous file with comments | « Source/core/html/track/InbandTextTrack.h ('k') | Source/core/html/track/TextTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698