Chromium Code Reviews| 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 19 matching lines...) Expand all Loading... | |
| 30 #include <memory> | 30 #include <memory> |
| 31 #include "bindings/core/v8/ActiveScriptWrappable.h" | 31 #include "bindings/core/v8/ActiveScriptWrappable.h" |
| 32 #include "bindings/core/v8/Nullable.h" | 32 #include "bindings/core/v8/Nullable.h" |
| 33 #include "bindings/core/v8/ScriptPromise.h" | 33 #include "bindings/core/v8/ScriptPromise.h" |
| 34 #include "bindings/core/v8/TraceWrapperMember.h" | 34 #include "bindings/core/v8/TraceWrapperMember.h" |
| 35 #include "core/CoreExport.h" | 35 #include "core/CoreExport.h" |
| 36 #include "core/dom/ExceptionCode.h" | 36 #include "core/dom/ExceptionCode.h" |
| 37 #include "core/dom/SuspendableObject.h" | 37 #include "core/dom/SuspendableObject.h" |
| 38 #include "core/events/GenericEventQueue.h" | 38 #include "core/events/GenericEventQueue.h" |
| 39 #include "core/html/HTMLElement.h" | 39 #include "core/html/HTMLElement.h" |
| 40 #include "core/html/HTMLMediaElementControlsList.h" | |
| 41 #include "core/html/track/TextTrack.h" | 40 #include "core/html/track/TextTrack.h" |
| 42 #include "platform/Supplementable.h" | 41 #include "platform/Supplementable.h" |
| 43 #include "platform/WebTaskRunner.h" | 42 #include "platform/WebTaskRunner.h" |
| 44 #include "platform/audio/AudioSourceProvider.h" | 43 #include "platform/audio/AudioSourceProvider.h" |
| 45 #include "platform/network/mime/MIMETypeRegistry.h" | 44 #include "platform/network/mime/MIMETypeRegistry.h" |
| 46 #include "public/platform/WebAudioSourceProviderClient.h" | 45 #include "public/platform/WebAudioSourceProviderClient.h" |
| 47 #include "public/platform/WebMediaPlayerClient.h" | 46 #include "public/platform/WebMediaPlayerClient.h" |
| 48 | 47 |
| 49 namespace blink { | 48 namespace blink { |
| 50 | 49 |
| 51 class AudioSourceProviderClient; | 50 class AudioSourceProviderClient; |
| 52 class AudioTrack; | 51 class AudioTrack; |
| 53 class AudioTrackList; | 52 class AudioTrackList; |
| 54 class AutoplayUmaHelper; | 53 class AutoplayUmaHelper; |
| 55 class ContentType; | 54 class ContentType; |
| 56 class CueTimeline; | 55 class CueTimeline; |
| 57 class ElementVisibilityObserver; | 56 class ElementVisibilityObserver; |
| 58 class EnumerationHistogram; | 57 class EnumerationHistogram; |
| 59 class Event; | 58 class Event; |
| 60 class ExceptionState; | 59 class ExceptionState; |
| 60 class HTMLMediaElementControlsList; | |
| 61 class HTMLSourceElement; | 61 class HTMLSourceElement; |
| 62 class HTMLTrackElement; | 62 class HTMLTrackElement; |
| 63 class KURL; | 63 class KURL; |
| 64 class MediaControls; | 64 class MediaControls; |
| 65 class MediaError; | 65 class MediaError; |
| 66 class MediaStreamDescriptor; | 66 class MediaStreamDescriptor; |
| 67 class HTMLMediaSource; | 67 class HTMLMediaSource; |
| 68 class ScriptState; | 68 class ScriptState; |
| 69 class TextTrackContainer; | 69 class TextTrackContainer; |
| 70 class TextTrackList; | 70 class TextTrackList; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 unsigned webkitAudioDecodedByteCount() const; | 197 unsigned webkitAudioDecodedByteCount() const; |
| 198 unsigned webkitVideoDecodedByteCount() const; | 198 unsigned webkitVideoDecodedByteCount() const; |
| 199 | 199 |
| 200 // media source extensions | 200 // media source extensions |
| 201 void closeMediaSource(); | 201 void closeMediaSource(); |
| 202 void durationChanged(double duration, bool requestSeek); | 202 void durationChanged(double duration, bool requestSeek); |
| 203 | 203 |
| 204 // controls | 204 // controls |
| 205 bool shouldShowControls( | 205 bool shouldShowControls( |
| 206 const RecordMetricsBehavior = RecordMetricsBehavior::DoNotRecord) const; | 206 const RecordMetricsBehavior = RecordMetricsBehavior::DoNotRecord) const; |
| 207 HTMLMediaElementControlsList* controlsList() const; | 207 DOMTokenList* controlsList() const; |
|
foolip
2017/04/04 09:12:55
Why was this change needed? HTMLMediaElementContro
mlamouri (slow - plz ping)
2017/04/04 09:19:51
I removed the include and replaced it with a forwa
foolip
2017/04/04 09:24:36
Acknowledged.
| |
| 208 HTMLMediaElementControlsList* controlsListInternal() const; | |
| 208 void controlsListValueWasSet(); | 209 void controlsListValueWasSet(); |
| 209 double volume() const; | 210 double volume() const; |
| 210 void setVolume(double, ExceptionState& = ASSERT_NO_EXCEPTION); | 211 void setVolume(double, ExceptionState& = ASSERT_NO_EXCEPTION); |
| 211 bool muted() const; | 212 bool muted() const; |
| 212 void setMuted(bool); | 213 void setMuted(bool); |
| 213 | 214 |
| 214 void togglePlayState(); | 215 void togglePlayState(); |
| 215 | 216 |
| 216 AudioTrackList& audioTracks(); | 217 AudioTrackList& audioTracks(); |
| 217 void audioTrackChanged(AudioTrack*); | 218 void audioTrackChanged(AudioTrack*); |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 762 | 763 |
| 763 inline bool isHTMLMediaElement(const HTMLElement& element) { | 764 inline bool isHTMLMediaElement(const HTMLElement& element) { |
| 764 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 765 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 765 } | 766 } |
| 766 | 767 |
| 767 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 768 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 768 | 769 |
| 769 } // namespace blink | 770 } // namespace blink |
| 770 | 771 |
| 771 #endif // HTMLMediaElement_h | 772 #endif // HTMLMediaElement_h |
| OLD | NEW |