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

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

Issue 656723005: Use C++11 features in core/html (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: mike's comments Created 6 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 | « Source/core/html/HTMLMapElement.cpp ('k') | Source/core/html/HTMLMediaElement.cpp » ('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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther }; 210 enum GroupKind { CaptionsAndSubtitles, Description, Chapter, Metadata, O ther };
211 211
212 explicit TrackGroup(GroupKind kind) 212 explicit TrackGroup(GroupKind kind)
213 : visibleTrack(nullptr) 213 : visibleTrack(nullptr)
214 , defaultTrack(nullptr) 214 , defaultTrack(nullptr)
215 , kind(kind) 215 , kind(kind)
216 , hasSrcLang(false) 216 , hasSrcLang(false)
217 { 217 {
218 } 218 }
219 219
220 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > tracks; 220 WillBeHeapVector<RefPtrWillBeMember<TextTrack>> tracks;
221 RefPtrWillBeMember<TextTrack> visibleTrack; 221 RefPtrWillBeMember<TextTrack> visibleTrack;
222 RefPtrWillBeMember<TextTrack> defaultTrack; 222 RefPtrWillBeMember<TextTrack> defaultTrack;
223 GroupKind kind; 223 GroupKind kind;
224 bool hasSrcLang; 224 bool hasSrcLang;
225 }; 225 };
226 226
227 void configureTextTrackGroupForLanguage(const TrackGroup&) const; 227 void configureTextTrackGroupForLanguage(const TrackGroup&) const;
228 void configureTextTracks(); 228 void configureTextTracks();
229 void configureTextTrackGroup(const TrackGroup&); 229 void configureTextTrackGroup(const TrackGroup&);
230 230
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 bool m_playingRemotely : 1; 577 bool m_playingRemotely : 1;
578 #if ENABLE(OILPAN) 578 #if ENABLE(OILPAN)
579 bool m_isFinalizing : 1; 579 bool m_isFinalizing : 1;
580 bool m_closeMediaSourceWhenFinalizing : 1; 580 bool m_closeMediaSourceWhenFinalizing : 1;
581 #endif 581 #endif
582 double m_lastTextTrackUpdateTime; 582 double m_lastTextTrackUpdateTime;
583 583
584 RefPtrWillBeMember<AudioTrackList> m_audioTracks; 584 RefPtrWillBeMember<AudioTrackList> m_audioTracks;
585 RefPtrWillBeMember<VideoTrackList> m_videoTracks; 585 RefPtrWillBeMember<VideoTrackList> m_videoTracks;
586 RefPtrWillBeMember<TextTrackList> m_textTracks; 586 RefPtrWillBeMember<TextTrackList> m_textTracks;
587 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; 587 WillBeHeapVector<RefPtrWillBeMember<TextTrack>> m_textTracksWhenResourceSele ctionBegan;
588 588
589 CueIntervalTree m_cueTree; 589 CueIntervalTree m_cueTree;
590 590
591 CueList m_currentlyActiveCues; 591 CueList m_currentlyActiveCues;
592 int m_ignoreTrackDisplayUpdate; 592 int m_ignoreTrackDisplayUpdate;
593 593
594 #if ENABLE(WEB_AUDIO) 594 #if ENABLE(WEB_AUDIO)
595 // This is a weak reference, since m_audioSourceNode holds a reference to us . 595 // This is a weak reference, since m_audioSourceNode holds a reference to us .
596 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem. 596 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
597 GC_PLUGIN_IGNORE("http://crbug.com/404577") 597 GC_PLUGIN_IGNORE("http://crbug.com/404577")
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 inline bool isHTMLMediaElement(const HTMLElement& element) 629 inline bool isHTMLMediaElement(const HTMLElement& element)
630 { 630 {
631 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 631 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
632 } 632 }
633 633
634 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 634 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
635 635
636 } // namespace blink 636 } // namespace blink
637 637
638 #endif // HTMLMediaElement_h 638 #endif // HTMLMediaElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMapElement.cpp ('k') | Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698