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

Unified Diff: Source/core/html/HTMLMediaElement.h

Issue 604753003: Removing #ifdefs for WEB_AUDIO compile time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/html/HTMLMediaElement.h
diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h
index 938516339b388b0ee24ac85024a36b5cbccc21ee..8365eac5aec4367e7bedb8c8c92f5da6ca62893b 100644
--- a/Source/core/html/HTMLMediaElement.h
+++ b/Source/core/html/HTMLMediaElement.h
@@ -46,10 +46,8 @@ class WebLayer;
namespace blink {
-#if ENABLE(WEB_AUDIO)
class AudioSourceProvider;
class AudioSourceProviderClient;
-#endif
class AudioTrackList;
class ContentType;
class Event;
@@ -85,9 +83,7 @@ public:
static bool isMediaStreamURL(const String& url);
virtual void trace(Visitor*) OVERRIDE;
-#if ENABLE(WEB_AUDIO)
void clearWeakMembers(Visitor*);
-#endif
blink::WebMediaPlayer* webMediaPlayer() const { return m_player ? m_player->webMediaPlayer() : 0; }
virtual bool hasVideo() const { return false; }
@@ -276,12 +272,10 @@ public:
virtual bool hasPendingActivity() const OVERRIDE FINAL;
virtual void contextDestroyed() OVERRIDE FINAL;
-#if ENABLE(WEB_AUDIO)
AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; }
void setAudioSourceNode(AudioSourceProviderClient*);
AudioSourceProvider* audioSourceProvider();
-#endif
enum InvalidURLAction { DoNothing, Complain };
bool isSafeToLoadURL(const KURL&, InvalidURLAction);
@@ -593,12 +587,10 @@ private:
CueList m_currentlyActiveCues;
int m_ignoreTrackDisplayUpdate;
-#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")
RawPtrWillBeWeakMember<AudioSourceProviderClient> m_audioSourceNode;
-#endif
friend class MediaController;
RefPtrWillBeMember<MediaController> m_mediaController;

Powered by Google App Engine
This is Rietveld 408576698