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

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

Issue 2657723002: [Blink, Media] Added controlsList to HTMLMediaElement (Closed)
Patch Set: Fixed comments Created 3 years, 9 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 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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef HTMLMediaElement_h 27 #ifndef HTMLMediaElement_h
28 #define HTMLMediaElement_h 28 #define HTMLMediaElement_h
29 29
30 #include <memory>
30 #include "bindings/core/v8/ActiveScriptWrappable.h" 31 #include "bindings/core/v8/ActiveScriptWrappable.h"
31 #include "bindings/core/v8/ScriptPromise.h" 32 #include "bindings/core/v8/ScriptPromise.h"
32 #include "bindings/core/v8/TraceWrapperMember.h" 33 #include "bindings/core/v8/TraceWrapperMember.h"
33 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
34 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
35 #include "core/dom/SuspendableObject.h" 36 #include "core/dom/SuspendableObject.h"
36 #include "core/events/GenericEventQueue.h" 37 #include "core/events/GenericEventQueue.h"
37 #include "core/html/HTMLElement.h" 38 #include "core/html/HTMLElement.h"
39 #include "core/html/HTMLMediaElementControlsList.h"
38 #include "core/html/track/TextTrack.h" 40 #include "core/html/track/TextTrack.h"
39 #include "platform/Supplementable.h" 41 #include "platform/Supplementable.h"
40 #include "platform/WebTaskRunner.h" 42 #include "platform/WebTaskRunner.h"
41 #include "platform/audio/AudioSourceProvider.h" 43 #include "platform/audio/AudioSourceProvider.h"
42 #include "platform/network/mime/MIMETypeRegistry.h" 44 #include "platform/network/mime/MIMETypeRegistry.h"
43 #include "public/platform/WebAudioSourceProviderClient.h" 45 #include "public/platform/WebAudioSourceProviderClient.h"
44 #include "public/platform/WebMediaPlayerClient.h" 46 #include "public/platform/WebMediaPlayerClient.h"
45 #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;
52 class AutoplayUmaHelper; 53 class AutoplayUmaHelper;
53 class ContentType; 54 class ContentType;
54 class CueTimeline; 55 class CueTimeline;
56 class DOMTokenList;
55 class ElementVisibilityObserver; 57 class ElementVisibilityObserver;
56 class EnumerationHistogram; 58 class EnumerationHistogram;
57 class Event; 59 class Event;
58 class ExceptionState; 60 class ExceptionState;
59 class HTMLSourceElement; 61 class HTMLSourceElement;
60 class HTMLTrackElement; 62 class HTMLTrackElement;
61 class KURL; 63 class KURL;
62 class MediaControls; 64 class MediaControls;
63 class MediaError; 65 class MediaError;
64 class MediaStreamDescriptor; 66 class MediaStreamDescriptor;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 unsigned webkitAudioDecodedByteCount() const; 197 unsigned webkitAudioDecodedByteCount() const;
196 unsigned webkitVideoDecodedByteCount() const; 198 unsigned webkitVideoDecodedByteCount() const;
197 199
198 // media source extensions 200 // media source extensions
199 void closeMediaSource(); 201 void closeMediaSource();
200 void durationChanged(double duration, bool requestSeek); 202 void durationChanged(double duration, bool requestSeek);
201 203
202 // controls 204 // controls
203 bool shouldShowControls( 205 bool shouldShowControls(
204 const RecordMetricsBehavior = RecordMetricsBehavior::DoNotRecord) const; 206 const RecordMetricsBehavior = RecordMetricsBehavior::DoNotRecord) const;
207 DOMTokenList* controlsList() const;
208 void controlsListValueWasSet();
205 double volume() const; 209 double volume() const;
206 void setVolume(double, ExceptionState& = ASSERT_NO_EXCEPTION); 210 void setVolume(double, ExceptionState& = ASSERT_NO_EXCEPTION);
207 bool muted() const; 211 bool muted() const;
208 void setMuted(bool); 212 void setMuted(bool);
209 213
210 void togglePlayState(); 214 void togglePlayState();
211 215
212 AudioTrackList& audioTracks(); 216 AudioTrackList& audioTracks();
213 void audioTrackChanged(AudioTrack*); 217 void audioTrackChanged(AudioTrack*);
214 218
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 Member<AutoplayUmaHelper> m_autoplayUmaHelper; 745 Member<AutoplayUmaHelper> m_autoplayUmaHelper;
742 746
743 WebRemotePlaybackClient* m_remotePlaybackClient; 747 WebRemotePlaybackClient* m_remotePlaybackClient;
744 748
745 // class AutoplayVisibilityObserver; 749 // class AutoplayVisibilityObserver;
746 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; 750 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver;
747 751
748 IntRect m_currentIntersectRect; 752 IntRect m_currentIntersectRect;
749 753
750 Member<MediaControls> m_mediaControls; 754 Member<MediaControls> m_mediaControls;
755 Member<HTMLMediaElementControlsList> m_controlsList;
751 756
752 static URLRegistry* s_mediaStreamRegistry; 757 static URLRegistry* s_mediaStreamRegistry;
753 }; 758 };
754 759
755 inline bool isHTMLMediaElement(const HTMLElement& element) { 760 inline bool isHTMLMediaElement(const HTMLElement& element) {
756 return isHTMLAudioElement(element) || isHTMLVideoElement(element); 761 return isHTMLAudioElement(element) || isHTMLVideoElement(element);
757 } 762 }
758 763
759 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); 764 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
760 765
761 } // namespace blink 766 } // namespace blink
762 767
763 #endif // HTMLMediaElement_h 768 #endif // HTMLMediaElement_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698