2011-01-21 Chris Rogers <crogers@google.com>

[WebKit.git] / Source / WebCore / platform / audio / chromium / AudioBusChromium.cpp

diff --git a/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp b/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
index a93703df56af8c03c7c0f25ffb70a8d4943ddbc9..232f13ecd4ed5251d35bf8844e8e2de9a3ba5ac4 100644 (file)
--- a/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
+++ b/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
@@ -29,21 +29,19 @@
 #include "AudioBus.h"
 
 #include "AudioFileReader.h"
-#include "ChromiumBridge.h"
+#include "PlatformBridge.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
-// We will use this version of loadPlatformResource() once the resources are checked into Chromium.
-
-// PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sampleRate)
-// {
-//     return ChromiumBridge::loadPlatformAudioResource(name, sampleRate);
-// }
+PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sampleRate)
+{
+    return ChromiumBridge::loadPlatformAudioResource(name, sampleRate);
+}
 
 PassOwnPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, double sampleRate)
 {
-    OwnPtr<AudioBus> audioBus = ChromiumBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
+    OwnPtr<AudioBus> audioBus = PlatformBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
     if (audioBus->numberOfChannels() == 2 && mixToMono) {
         OwnPtr<AudioBus> monoAudioBus = adoptPtr(new AudioBus(1, audioBus->length()));