| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "bindings/core/v8/TraceWrapperMember.h" | 32 #include "bindings/core/v8/TraceWrapperMember.h" |
| 33 #include "core/CoreExport.h" | 33 #include "core/CoreExport.h" |
| 34 #include "core/dom/ActiveDOMObject.h" | 34 #include "core/dom/ActiveDOMObject.h" |
| 35 #include "core/dom/ExceptionCode.h" | 35 #include "core/dom/ExceptionCode.h" |
| 36 #include "core/events/GenericEventQueue.h" | 36 #include "core/events/GenericEventQueue.h" |
| 37 #include "core/html/AutoplayExperimentHelper.h" | 37 #include "core/html/AutoplayExperimentHelper.h" |
| 38 #include "core/html/HTMLElement.h" | 38 #include "core/html/HTMLElement.h" |
| 39 #include "core/html/track/TextTrack.h" | 39 #include "core/html/track/TextTrack.h" |
| 40 #include "platform/MIMETypeRegistry.h" | 40 #include "platform/MIMETypeRegistry.h" |
| 41 #include "platform/Supplementable.h" | 41 #include "platform/Supplementable.h" |
| 42 #include "platform/WebTaskRunner.h" |
| 42 #include "platform/audio/AudioSourceProvider.h" | 43 #include "platform/audio/AudioSourceProvider.h" |
| 43 #include "public/platform/WebAudioSourceProviderClient.h" | 44 #include "public/platform/WebAudioSourceProviderClient.h" |
| 44 #include "public/platform/WebMediaPlayerClient.h" | 45 #include "public/platform/WebMediaPlayerClient.h" |
| 45 #include <memory> | 46 #include <memory> |
| 46 | 47 |
| 47 namespace blink { | 48 namespace blink { |
| 48 | 49 |
| 49 class AudioSourceProviderClient; | 50 class AudioSourceProviderClient; |
| 50 class AudioTrack; | 51 class AudioTrack; |
| 51 class AudioTrackList; | 52 class AudioTrackList; |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 648 bool m_inOverlayFullscreenVideo : 1; | 649 bool m_inOverlayFullscreenVideo : 1; |
| 649 | 650 |
| 650 TraceWrapperMember<AudioTrackList> m_audioTracks; | 651 TraceWrapperMember<AudioTrackList> m_audioTracks; |
| 651 TraceWrapperMember<VideoTrackList> m_videoTracks; | 652 TraceWrapperMember<VideoTrackList> m_videoTracks; |
| 652 TraceWrapperMember<TextTrackList> m_textTracks; | 653 TraceWrapperMember<TextTrackList> m_textTracks; |
| 653 HeapVector<Member<TextTrack>> m_textTracksWhenResourceSelectionBegan; | 654 HeapVector<Member<TextTrack>> m_textTracksWhenResourceSelectionBegan; |
| 654 | 655 |
| 655 Member<CueTimeline> m_cueTimeline; | 656 Member<CueTimeline> m_cueTimeline; |
| 656 | 657 |
| 657 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolvers; | 658 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolvers; |
| 658 std::unique_ptr<CancellableTaskFactory> m_playPromiseResolveTask; | 659 TaskHandle m_playPromiseResolveTaskHandle; |
| 659 std::unique_ptr<CancellableTaskFactory> m_playPromiseRejectTask; | 660 TaskHandle m_playPromiseRejectTaskHandle; |
| 660 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolveList; | 661 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolveList; |
| 661 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList; | 662 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList; |
| 662 ExceptionCode m_playPromiseErrorCode; | 663 ExceptionCode m_playPromiseErrorCode; |
| 663 | 664 |
| 664 // This is a weak reference, since m_audioSourceNode holds a reference to us. | 665 // This is a weak reference, since m_audioSourceNode holds a reference to us. |
| 665 // TODO(Oilpan): Consider making this a strongly traced pointer with oilpan | 666 // TODO(Oilpan): Consider making this a strongly traced pointer with oilpan |
| 666 // where strong cycles are not a problem. | 667 // where strong cycles are not a problem. |
| 667 GC_PLUGIN_IGNORE("http://crbug.com/404577") | 668 GC_PLUGIN_IGNORE("http://crbug.com/404577") |
| 668 WeakMember<AudioSourceProviderClient> m_audioSourceNode; | 669 WeakMember<AudioSourceProviderClient> m_audioSourceNode; |
| 669 | 670 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 | 737 |
| 737 inline bool isHTMLMediaElement(const HTMLElement& element) { | 738 inline bool isHTMLMediaElement(const HTMLElement& element) { |
| 738 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 739 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 739 } | 740 } |
| 740 | 741 |
| 741 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 742 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 742 | 743 |
| 743 } // namespace blink | 744 } // namespace blink |
| 744 | 745 |
| 745 #endif // HTMLMediaElement_h | 746 #endif // HTMLMediaElement_h |
| OLD | NEW |