Index: Source/core/html/HTMLMediaElement.h |
diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h |
index fedf42c3f4e216b3f02523dbfe0d5b7f74cbf8bc..0ed3e85a59f21cde158e5b4d3175e4f6249f7ee3 100644 |
--- a/Source/core/html/HTMLMediaElement.h |
+++ b/Source/core/html/HTMLMediaElement.h |
@@ -73,7 +73,6 @@ typedef Vector<CueInterval> CueList; |
// no longer depends on typecasting a MediaPlayerClient to an HTMLMediaElement. |
class HTMLMediaElement : public HTMLElement, public MediaPlayerClient, public ActiveDOMObject, public MediaControllerInterface |
- , private TextTrackClient |
{ |
public: |
static blink::WebMimeRegistry::SupportsType supportsType(const ContentType&, const String& keySystem = String()); |
@@ -233,13 +232,12 @@ public: |
void updateTextTrackDisplay(); |
void textTrackReadyStateChanged(TextTrack*); |
- // TextTrackClient |
- virtual void textTrackKindChanged(TextTrack*) OVERRIDE FINAL; |
- virtual void textTrackModeChanged(TextTrack*) OVERRIDE FINAL; |
- virtual void textTrackAddCues(TextTrack*, const TextTrackCueList*) OVERRIDE FINAL; |
- virtual void textTrackRemoveCues(TextTrack*, const TextTrackCueList*) OVERRIDE FINAL; |
- virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRIDE FINAL; |
- virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRIDE FINAL; |
+ virtual void textTrackKindChanged(TextTrack*); |
adamk
2014/02/27 01:55:09
Can these be non-virtual now?
acolwell GONE FROM CHROMIUM
2014/02/27 03:57:06
Yes. Done.
|
+ virtual void textTrackModeChanged(TextTrack*); |
+ virtual void textTrackAddCues(TextTrack*, const TextTrackCueList*); |
+ virtual void textTrackRemoveCues(TextTrack*, const TextTrackCueList*); |
+ virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>); |
+ virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>); |
// EventTarget function. |
// Both Node (via HTMLElement) and ActiveDOMObject define this method, which |