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

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

Issue 54963004: Make LoadableTextTrack::clearClient not virtual (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month 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 | « no previous file | no next file » | 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 27 matching lines...) Expand all
38 class LoadableTextTrack : public TextTrack, private TextTrackLoaderClient { 38 class LoadableTextTrack : public TextTrack, private TextTrackLoaderClient {
39 public: 39 public:
40 static PassRefPtr<LoadableTextTrack> create(HTMLTrackElement* track, const S tring& kind, const String& label, const String& language) 40 static PassRefPtr<LoadableTextTrack> create(HTMLTrackElement* track, const S tring& kind, const String& label, const String& language)
41 { 41 {
42 return adoptRef(new LoadableTextTrack(track, kind, label, language)); 42 return adoptRef(new LoadableTextTrack(track, kind, label, language));
43 } 43 }
44 virtual ~LoadableTextTrack(); 44 virtual ~LoadableTextTrack();
45 45
46 void scheduleLoad(const KURL&); 46 void scheduleLoad(const KURL&);
47 47
48 virtual void clearClient(); 48 // This shadows TextTrack::clearClient, but need not be virtual.
49 void clearClient();
49 50
50 size_t trackElementIndex(); 51 size_t trackElementIndex();
51 HTMLTrackElement* trackElement() { return m_trackElement; } 52 HTMLTrackElement* trackElement() { return m_trackElement; }
52 53
53 virtual bool isDefault() const OVERRIDE { return m_isDefault; } 54 virtual bool isDefault() const OVERRIDE { return m_isDefault; }
54 virtual void setIsDefault(bool isDefault) OVERRIDE { m_isDefault = isDefaul t; } 55 virtual void setIsDefault(bool isDefault) OVERRIDE { m_isDefault = isDefaul t; }
55 56
56 private: 57 private:
57 // TextTrackLoaderClient 58 // TextTrackLoaderClient
58 virtual void newCuesAvailable(TextTrackLoader*) OVERRIDE; 59 virtual void newCuesAvailable(TextTrackLoader*) OVERRIDE;
59 virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) OVERR IDE; 60 virtual void cueLoadingCompleted(TextTrackLoader*, bool loadingFailed) OVERR IDE;
60 virtual void newRegionsAvailable(TextTrackLoader*) OVERRIDE; 61 virtual void newRegionsAvailable(TextTrackLoader*) OVERRIDE;
61 62
62 LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label , const String& language); 63 LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label , const String& language);
63 64
64 void loadTimerFired(Timer<LoadableTextTrack>*); 65 void loadTimerFired(Timer<LoadableTextTrack>*);
65 66
66 HTMLTrackElement* m_trackElement; 67 HTMLTrackElement* m_trackElement;
67 Timer<LoadableTextTrack> m_loadTimer; 68 Timer<LoadableTextTrack> m_loadTimer;
68 OwnPtr<TextTrackLoader> m_loader; 69 OwnPtr<TextTrackLoader> m_loader;
69 KURL m_url; 70 KURL m_url;
70 bool m_isDefault; 71 bool m_isDefault;
71 }; 72 };
72 } // namespace WebCore 73 } // namespace WebCore
73 74
74 #endif 75 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698