| Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| index 5a29fd6bf45e6aa15e7c8c41410c22b65e18aa04..6f7a88831903de7c8e6d20b7de63cc1a803e7641 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
|
| @@ -33,20 +33,14 @@
|
| #include "core/html/HTMLElement.h"
|
| #include "core/html/track/TextTrack.h"
|
| #include "platform/Supplementable.h"
|
| -#include "public/platform/WebMediaPlayerClient.h"
|
| -#include "public/platform/WebMimeRegistry.h"
|
| -
|
| -#if ENABLE(WEB_AUDIO)
|
| #include "platform/audio/AudioSourceProvider.h"
|
| #include "public/platform/WebAudioSourceProviderClient.h"
|
| -#endif
|
| +#include "public/platform/WebMediaPlayerClient.h"
|
| +#include "public/platform/WebMimeRegistry.h"
|
|
|
| namespace blink {
|
|
|
| -#if ENABLE(WEB_AUDIO)
|
| class AudioSourceProviderClient;
|
| -class WebAudioSourceProvider;
|
| -#endif
|
| class AudioTrackList;
|
| class ContentType;
|
| class CueTimeline;
|
| @@ -63,6 +57,7 @@ class TextTrackList;
|
| class TimeRanges;
|
| class URLRegistry;
|
| class VideoTrackList;
|
| +class WebAudioSourceProvider;
|
| class WebInbandTextTrack;
|
| class WebLayer;
|
|
|
| @@ -77,9 +72,7 @@ public:
|
| static bool isMediaStreamURL(const String& url);
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
| -#if ENABLE(WEB_AUDIO)
|
| void clearWeakMembers(Visitor*);
|
| -#endif
|
| WebMediaPlayer* webMediaPlayer() const
|
| {
|
| return m_webMediaPlayer.get();
|
| @@ -233,12 +226,10 @@ public:
|
| // ActiveDOMObject functions.
|
| bool hasPendingActivity() const final;
|
|
|
| -#if ENABLE(WEB_AUDIO)
|
| AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
|
| void setAudioSourceNode(AudioSourceProviderClient*);
|
|
|
| AudioSourceProvider& audioSourceProvider() { return m_audioSourceProvider; }
|
| -#endif
|
|
|
| enum InvalidURLAction { DoNothing, Complain };
|
| bool isSafeToLoadURL(const KURL&, InvalidURLAction);
|
| @@ -566,7 +557,6 @@ private:
|
|
|
| OwnPtrWillBeMember<CueTimeline> m_cueTimeline;
|
|
|
| -#if ENABLE(WEB_AUDIO)
|
| // This is a weak reference, since m_audioSourceNode holds a reference to us.
|
| // FIXME: Oilpan: Consider making this a strongly traced pointer with oilpan where strong cycles are not a problem.
|
| GC_PLUGIN_IGNORE("http://crbug.com/404577")
|
| @@ -620,7 +610,6 @@ private:
|
| };
|
|
|
| AudioSourceProviderImpl m_audioSourceProvider;
|
| -#endif
|
|
|
| friend class Internals;
|
| friend class TrackDisplayUpdateScope;
|
|
|