Changeset 126939 in webkit

Timestamp:

Aug 28, 2012, 4:30:19 PM (14 years ago)

Author:

pilgrim@chromium.org

Message:

[Chromium] Remove decodeAudioFileData from PlatformSupport
​https://bugs.webkit.org/show_bug.cgi?id=95250

Reviewed by Adam Barth.

Part of a refactoring series. See tracking bug 82948.

Source/WebCore:

• platform/audio/chromium/AudioBusChromium.cpp:

(WebCore::decodeAudioFileData):
(WebCore):
(WebCore::AudioBus::loadPlatformResource):
(WebCore::createBusFromInMemoryAudioFile):

• platform/chromium/PlatformSupport.h:

(PlatformSupport):

Source/WebKit/chromium:

• src/PlatformSupport.cpp:

(WebCore):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/audio/chromium/AudioBusChromium.cpp (modified) (3 diffs)
• WebCore/platform/chromium/PlatformSupport.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/PlatformSupport.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-28  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [Chromium] Remove decodeAudioFileData from PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=95250
+
+        Reviewed by Adam Barth.
+
+        Part of a refactoring series. See tracking bug 82948.
+
+        * platform/audio/chromium/AudioBusChromium.cpp:
+        (WebCore::decodeAudioFileData):
+        (WebCore):
+        (WebCore::AudioBus::loadPlatformResource):
+        (WebCore::createBusFromInMemoryAudioFile):
+        * platform/chromium/PlatformSupport.h:
+        (PlatformSupport):
+
 2012-08-27  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp

@@ -30 +30 @@
 
 #include "AudioFileReader.h"
-#include "PlatformSupport.h"
 #include <public/Platform.h>
+#include <public/WebAudioBus.h>
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
+
+PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double sampleRate)
+{
+    WebKit::WebAudioBus webAudioBus;
+    if (WebKit::Platform::current()->loadAudioResource(&webAudioBus, data, size, sampleRate))
+        return webAudioBus.release();
+    return nullptr;
+}
 
 PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float sampleRate)
@@ -41 +49 @@
     if (resource.isEmpty())
         return nullptr;
-    
+
     // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
-    OwnPtr<AudioBus> audioBus = PlatformSupport::decodeAudioFileData(resource.data(), resource.size(), sampleRate);
+    OwnPtr<AudioBus> audioBus = decodeAudioFileData(resource.data(), resource.size(), sampleRate);
 
     if (!audioBus.get())
         return nullptr;
-    
+
     // If the bus is already at the requested sample-rate then return as is.
     if (audioBus->sampleRate() == sampleRate)
         return audioBus.release();
-    
+
     return AudioBus::createBySampleRateConverting(audioBus.get(), false, sampleRate);
 }
@@ -58 +66 @@
 {
     // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
-    OwnPtr<AudioBus> audioBus = PlatformSupport::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
+    OwnPtr<AudioBus> audioBus = decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
     if (!audioBus.get())
         return nullptr;
-      
+
     // If the bus needs no conversion then return as is.
     if ((!mixToMono || audioBus->numberOfChannels() == 1) && audioBus->sampleRate() == sampleRate)
         return audioBus.release();
-    
-    return AudioBus::createBySampleRateConverting(audioBus.get(), mixToMono, sampleRate);    
+
+    return AudioBus::createBySampleRateConverting(audioBus.get(), mixToMono, sampleRate);
 }
 

trunk/Source/WebCore/platform/chromium/PlatformSupport.h

@@ -134 +134 @@
     static bool popupsAllowed(NPP);
 
-    // Resources ----------------------------------------------------------
-#if ENABLE(WEB_AUDIO)
-    static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t, double sampleRate);
-#endif
-
     // Screen -------------------------------------------------------------
     static int screenHorizontalDPI(Widget*);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-08-28  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [Chromium] Remove decodeAudioFileData from PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=95250
+
+        Reviewed by Adam Barth.
+
+        Part of a refactoring series. See tracking bug 82948.
+
+        * src/PlatformSupport.cpp:
+        (WebCore):
+
 2012-08-28  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/PlatformSupport.cpp

@@ -318 +318 @@
 }
 
-// Resources ------------------------------------------------------------------
-
-#if ENABLE(WEB_AUDIO)
-
-PassOwnPtr<AudioBus> PlatformSupport::decodeAudioFileData(const char* data, size_t size, double sampleRate)
-{
-    WebAudioBus webAudioBus;
-    if (webKitPlatformSupport()->loadAudioResource(&webAudioBus, data, size, sampleRate))
-        return webAudioBus.release();
-    return nullptr;
-}
-
-#endif // ENABLE(WEB_AUDIO)
-
 // Theming --------------------------------------------------------------------