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

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

Issue 1865933002: Fix race when HTMLMediaElement.play() is called just after pause(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update expectations Created 4 years, 8 months 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
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 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 // Whether this element is in overlay fullscreen mode. 572 // Whether this element is in overlay fullscreen mode.
573 bool m_inOverlayFullscreenVideo : 1; 573 bool m_inOverlayFullscreenVideo : 1;
574 574
575 Member<AudioTrackList> m_audioTracks; 575 Member<AudioTrackList> m_audioTracks;
576 Member<VideoTrackList> m_videoTracks; 576 Member<VideoTrackList> m_videoTracks;
577 Member<TextTrackList> m_textTracks; 577 Member<TextTrackList> m_textTracks;
578 HeapVector<Member<TextTrack>> m_textTracksWhenResourceSelectionBegan; 578 HeapVector<Member<TextTrack>> m_textTracksWhenResourceSelectionBegan;
579 579
580 Member<CueTimeline> m_cueTimeline; 580 Member<CueTimeline> m_cueTimeline;
581 581
582 HeapVector<Member<ScriptPromiseResolver>> m_playResolvers; 582 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolvers;
583 OwnPtr<CancellableTaskFactory> m_playPromiseResolveTask; 583 OwnPtr<CancellableTaskFactory> m_playPromiseResolveTask;
584 OwnPtr<CancellableTaskFactory> m_playPromiseRejectTask; 584 OwnPtr<CancellableTaskFactory> m_playPromiseRejectTask;
585 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolveList;
586 HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList;
585 ExceptionCode m_playPromiseErrorCode; 587 ExceptionCode m_playPromiseErrorCode;
586 588
587 // This is a weak reference, since m_audioSourceNode holds a reference to us . 589 // This is a weak reference, since m_audioSourceNode holds a reference to us .
588 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem. 590 // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
589 GC_PLUGIN_IGNORE("http://crbug.com/404577") 591 GC_PLUGIN_IGNORE("http://crbug.com/404577")
590 WeakMember<AudioSourceProviderClient> m_audioSourceNode; 592 WeakMember<AudioSourceProviderClient> m_audioSourceNode;
591 593
592 // AudioClientImpl wraps an AudioSourceProviderClient. 594 // AudioClientImpl wraps an AudioSourceProviderClient.
593 // When the audio format is known, Chromium calls setFormat(). 595 // When the audio format is known, Chromium calls setFormat().
594 class AudioClientImpl final : public GarbageCollectedFinalized<AudioClientIm pl>, public WebAudioSourceProviderClient { 596 class AudioClientImpl final : public GarbageCollectedFinalized<AudioClientIm pl>, public WebAudioSourceProviderClient {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 inline bool isHTMLMediaElement(const HTMLElement& element) 662 inline bool isHTMLMediaElement(const HTMLElement& element)
661 { 663 {
662 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 664 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
663 } 665 }
664 666
665 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 667 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
666 668
667 } // namespace blink 669 } // namespace blink
668 670
669 #endif // HTMLMediaElement_h 671 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698