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

Side by Side Diff: Source/core/html/HTMLMediaElement.h

Issue 53453004: Remove virtual where not needed in HTMLMediaElement/HTMLVideoElement (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 | Source/core/html/HTMLVideoElement.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) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 MediaPlayer* player() const { return m_player.get(); } 79 MediaPlayer* player() const { return m_player.get(); }
80 80
81 virtual bool isVideo() const = 0; 81 virtual bool isVideo() const = 0;
82 virtual bool hasVideo() const OVERRIDE { return false; } 82 virtual bool hasVideo() const OVERRIDE { return false; }
83 virtual bool hasAudio() const OVERRIDE; 83 virtual bool hasAudio() const OVERRIDE;
84 84
85 // Eventually overloaded in HTMLVideoElement 85 // Eventually overloaded in HTMLVideoElement
86 virtual bool supportsFullscreen() const OVERRIDE { return false; }; 86 virtual bool supportsFullscreen() const OVERRIDE { return false; };
87 87
88 virtual bool supportsSave() const; 88 bool supportsSave() const;
89 89
90 WebKit::WebLayer* platformLayer() const; 90 WebKit::WebLayer* platformLayer() const;
91 91
92 enum DelayedActionType { 92 enum DelayedActionType {
93 LoadMediaResource = 1 << 0, 93 LoadMediaResource = 1 << 0,
94 LoadTextTrackResource = 1 << 1, 94 LoadTextTrackResource = 1 << 1,
95 TextTrackChangesNotification = 1 << 2 95 TextTrackChangesNotification = 1 << 2
96 }; 96 };
97 void scheduleDelayedAction(DelayedActionType); 97 void scheduleDelayedAction(DelayedActionType);
98 98
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 TextTrackList* textTracks(); 186 TextTrackList* textTracks();
187 CueList currentlyActiveCues() const { return m_currentlyActiveCues; } 187 CueList currentlyActiveCues() const { return m_currentlyActiveCues; }
188 188
189 void addTrack(TextTrack*); 189 void addTrack(TextTrack*);
190 void removeTrack(TextTrack*); 190 void removeTrack(TextTrack*);
191 void removeAllInbandTracks(); 191 void removeAllInbandTracks();
192 void closeCaptionTracksChanged(); 192 void closeCaptionTracksChanged();
193 void notifyMediaPlayerOfTextTrackChanges(); 193 void notifyMediaPlayerOfTextTrackChanges();
194 194
195 virtual void didAddTrack(HTMLTrackElement*); 195 void didAddTrack(HTMLTrackElement*);
196 virtual void didRemoveTrack(HTMLTrackElement*); 196 void didRemoveTrack(HTMLTrackElement*);
197 197
198 virtual void mediaPlayerDidAddTrack(PassRefPtr<InbandTextTrackPrivate>) OVER RIDE; 198 virtual void mediaPlayerDidAddTrack(PassRefPtr<InbandTextTrackPrivate>) OVER RIDE;
199 virtual void mediaPlayerDidRemoveTrack(PassRefPtr<InbandTextTrackPrivate>) O VERRIDE; 199 virtual void mediaPlayerDidRemoveTrack(PassRefPtr<InbandTextTrackPrivate>) O VERRIDE;
200 200
201 struct TrackGroup { 201 struct TrackGroup {
202 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 202 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
203 203
204 TrackGroup(GroupKind kind) 204 TrackGroup(GroupKind kind)
205 : visibleTrack(0) 205 : visibleTrack(0)
206 , defaultTrack(0) 206 , defaultTrack(0)
(...skipping 13 matching lines...) Expand all
220 void configureTextTracks(); 220 void configureTextTracks();
221 void configureTextTrackGroup(const TrackGroup&); 221 void configureTextTrackGroup(const TrackGroup&);
222 222
223 bool textTracksAreReady() const; 223 bool textTracksAreReady() const;
224 enum VisibilityChangeAssumption { 224 enum VisibilityChangeAssumption {
225 AssumeNoVisibleChange, 225 AssumeNoVisibleChange,
226 AssumeVisibleChange 226 AssumeVisibleChange
227 }; 227 };
228 void configureTextTrackDisplay(VisibilityChangeAssumption); 228 void configureTextTrackDisplay(VisibilityChangeAssumption);
229 void updateTextTrackDisplay(); 229 void updateTextTrackDisplay();
230 void textTrackReadyStateChanged(TextTrack*);
Mike West 2013/11/01 10:31:23 Why move this?
philipj_slow 2013/11/01 10:37:27 To make it clear that it isn't actually part of th
230 231
231 // TextTrackClient 232 // TextTrackClient
232 virtual void textTrackReadyStateChanged(TextTrack*);
233 virtual void textTrackKindChanged(TextTrack*) OVERRIDE; 233 virtual void textTrackKindChanged(TextTrack*) OVERRIDE;
234 virtual void textTrackModeChanged(TextTrack*) OVERRIDE; 234 virtual void textTrackModeChanged(TextTrack*) OVERRIDE;
235 virtual void textTrackAddCues(TextTrack*, const TextTrackCueList*) OVERRIDE; 235 virtual void textTrackAddCues(TextTrack*, const TextTrackCueList*) OVERRIDE;
236 virtual void textTrackRemoveCues(TextTrack*, const TextTrackCueList*) OVERRI DE; 236 virtual void textTrackRemoveCues(TextTrack*, const TextTrackCueList*) OVERRI DE;
237 virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRIDE; 237 virtual void textTrackAddCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRIDE;
238 virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRI DE; 238 virtual void textTrackRemoveCue(TextTrack*, PassRefPtr<TextTrackCue>) OVERRI DE;
239 239
240 // EventTarget function. 240 // EventTarget function.
241 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which 241 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which
242 // causes an ambiguity error at compile time. This class's constructor 242 // causes an ambiguity error at compile time. This class's constructor
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 inline bool isHTMLMediaElement(const Node& node) 600 inline bool isHTMLMediaElement(const Node& node)
601 { 601 {
602 return node.isElementNode() && toElement(node).isMediaElement(); 602 return node.isElementNode() && toElement(node).isMediaElement();
603 } 603 }
604 604
605 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 605 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
606 606
607 } //namespace 607 } //namespace
608 608
609 #endif 609 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/HTMLVideoElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698