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

Unified Diff: Source/platform/exported/WebAudioBus.cpp

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/platform/exported/WebAudioBus.cpp
diff --git a/Source/platform/exported/WebAudioBus.cpp b/Source/platform/exported/WebAudioBus.cpp
index 4e55a879a1e511b3a3f29796197dc1a8a2a209ed..521c701050166c8f36f3844ac9630d09866db9e8 100644
--- a/Source/platform/exported/WebAudioBus.cpp
+++ b/Source/platform/exported/WebAudioBus.cpp
@@ -25,16 +25,7 @@
#include "config.h"
#include "public/platform/WebAudioBus.h"
-#if ENABLE(WEB_AUDIO)
#include "platform/audio/AudioBus.h"
-#else
-#include "wtf/ThreadSafeRefCounted.h"
-
-namespace blink {
-class AudioBus : public ThreadSafeRefCounted<AudioBus> {
-};
-} // namespace blink
-#endif
#include "wtf/PassRefPtr.h"
#include "wtf/RefPtr.h"
@@ -46,7 +37,6 @@ class WebAudioBusPrivate : public AudioBus {
void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sampleRate)
{
-#if ENABLE(WEB_AUDIO)
RefPtr<AudioBus> audioBus = AudioBus::create(numberOfChannels, length);
audioBus->setSampleRate(sampleRate);
@@ -55,95 +45,59 @@ void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sa
audioBus->ref();
m_private = static_cast<WebAudioBusPrivate*>(audioBus.get());
-#else
- ASSERT_NOT_REACHED();
-#endif
}
void WebAudioBus::resizeSmaller(size_t newLength)
{
-#if ENABLE(WEB_AUDIO)
ASSERT(m_private);
if (m_private) {
ASSERT(newLength <= length());
m_private->resizeSmaller(newLength);
}
-#else
- ASSERT_NOT_REACHED();
-#endif
}
void WebAudioBus::reset()
{
-#if ENABLE(WEB_AUDIO)
if (m_private) {
(static_cast<AudioBus*>(m_private))->deref();
m_private = 0;
}
-#else
- ASSERT_NOT_REACHED();
-#endif
}
unsigned WebAudioBus::numberOfChannels() const
{
-#if ENABLE(WEB_AUDIO)
if (!m_private)
return 0;
return m_private->numberOfChannels();
-#else
- ASSERT_NOT_REACHED();
- return 0;
-#endif
}
size_t WebAudioBus::length() const
{
-#if ENABLE(WEB_AUDIO)
if (!m_private)
return 0;
return m_private->length();
-#else
- ASSERT_NOT_REACHED();
- return 0;
-#endif
}
double WebAudioBus::sampleRate() const
{
-#if ENABLE(WEB_AUDIO)
if (!m_private)
return 0;
return m_private->sampleRate();
-#else
- ASSERT_NOT_REACHED();
- return 0;
-#endif
}
float* WebAudioBus::channelData(unsigned channelIndex)
{
-#if ENABLE(WEB_AUDIO)
if (!m_private)
return 0;
ASSERT(channelIndex < numberOfChannels());
return m_private->channel(channelIndex)->mutableData();
-#else
- ASSERT_NOT_REACHED();
- return 0;
-#endif
}
PassRefPtr<AudioBus> WebAudioBus::release()
{
-#if ENABLE(WEB_AUDIO)
RefPtr<AudioBus> audioBus(adoptRef(static_cast<AudioBus*>(m_private)));
m_private = 0;
return audioBus;
-#else
- ASSERT_NOT_REACHED();
- return nullptr;
-#endif
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698