Chromium Code Reviews| 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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 507 RefPtrWillBeMember<TextTrackList> m_textTracks; | 507 RefPtrWillBeMember<TextTrackList> m_textTracks; |
| 508 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; | 508 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; |
| 509 | 509 |
| 510 CueIntervalTree m_cueTree; | 510 CueIntervalTree m_cueTree; |
| 511 | 511 |
| 512 CueList m_currentlyActiveCues; | 512 CueList m_currentlyActiveCues; |
| 513 int m_ignoreTrackDisplayUpdate; | 513 int m_ignoreTrackDisplayUpdate; |
| 514 | 514 |
| 515 #if ENABLE(WEB_AUDIO) | 515 #if ENABLE(WEB_AUDIO) |
| 516 // This is a weak reference, since m_audioSourceNode holds a reference to us . | 516 // This is a weak reference, since m_audioSourceNode holds a reference to us . |
| 517 AudioSourceProviderClient* m_audioSourceNode; | 517 RawPtrWillBeMember<AudioSourceProviderClient> m_audioSourceNode; |
|
haraken
2014/05/21 16:35:58
Shouldn't this be a weak member?
zerny-chromium
2014/05/22 05:54:32
It appears to be raw simply to break what would ot
haraken
2014/05/22 07:33:36
In the current implementation, it looks like that
Mads Ager (chromium)
2014/05/22 08:02:56
I think what that comment is saying is that this i
| |
| 518 #endif | 518 #endif |
| 519 | 519 |
| 520 friend class MediaController; | 520 friend class MediaController; |
| 521 RefPtr<MediaController> m_mediaController; | 521 RefPtr<MediaController> m_mediaController; |
| 522 | 522 |
| 523 friend class Internals; | 523 friend class Internals; |
| 524 friend class TrackDisplayUpdateScope; | 524 friend class TrackDisplayUpdateScope; |
| 525 | 525 |
| 526 static URLRegistry* s_mediaStreamRegistry; | 526 static URLRegistry* s_mediaStreamRegistry; |
| 527 }; | 527 }; |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 553 inline bool isHTMLMediaElement(const HTMLElement& element) | 553 inline bool isHTMLMediaElement(const HTMLElement& element) |
| 554 { | 554 { |
| 555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 555 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 556 } | 556 } |
| 557 | 557 |
| 558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 558 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 559 | 559 |
| 560 } //namespace | 560 } //namespace |
| 561 | 561 |
| 562 #endif | 562 #endif |
| OLD | NEW |