| OLD | NEW |
| 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel
ectionBegan; | 585 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel
ectionBegan; |
| 586 | 586 |
| 587 CueIntervalTree m_cueTree; | 587 CueIntervalTree m_cueTree; |
| 588 | 588 |
| 589 CueList m_currentlyActiveCues; | 589 CueList m_currentlyActiveCues; |
| 590 int m_ignoreTrackDisplayUpdate; | 590 int m_ignoreTrackDisplayUpdate; |
| 591 | 591 |
| 592 #if ENABLE(WEB_AUDIO) | 592 #if ENABLE(WEB_AUDIO) |
| 593 // This is a weak reference, since m_audioSourceNode holds a reference to us
. | 593 // This is a weak reference, since m_audioSourceNode holds a reference to us
. |
| 594 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan
where strong cycles are not a problem. | 594 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan
where strong cycles are not a problem. |
| 595 GC_PLUGIN_IGNORE("http://crbug.com/404577") |
| 595 RawPtrWillBeWeakMember<AudioSourceProviderClient> m_audioSourceNode; | 596 RawPtrWillBeWeakMember<AudioSourceProviderClient> m_audioSourceNode; |
| 596 #endif | 597 #endif |
| 597 | 598 |
| 598 friend class MediaController; | 599 friend class MediaController; |
| 599 RefPtrWillBeMember<MediaController> m_mediaController; | 600 RefPtrWillBeMember<MediaController> m_mediaController; |
| 600 | 601 |
| 601 friend class Internals; | 602 friend class Internals; |
| 602 friend class TrackDisplayUpdateScope; | 603 friend class TrackDisplayUpdateScope; |
| 603 | 604 |
| 604 static URLRegistry* s_mediaStreamRegistry; | 605 static URLRegistry* s_mediaStreamRegistry; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 626 inline bool isHTMLMediaElement(const HTMLElement& element) | 627 inline bool isHTMLMediaElement(const HTMLElement& element) |
| 627 { | 628 { |
| 628 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 629 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 629 } | 630 } |
| 630 | 631 |
| 631 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 632 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 632 | 633 |
| 633 } //namespace | 634 } //namespace |
| 634 | 635 |
| 635 #endif | 636 #endif |
| OLD | NEW |