Title: [115644] trunk/Source
- Revision
- 115644
- Author
- [email protected]
- Date
- 2012-04-30 09:34:08 -0700 (Mon, 30 Apr 2012)
Log Message
[Chromium] Remove PlatformSupport::loadPlatformAudioResource, call loadResource directly
https://bugs.webkit.org/show_bug.cgi?id=85193
Reviewed by Kentaro Hara.
Part of a refactoring series. See tracking bug 82948.
Source/WebCore:
* platform/audio/chromium/AudioBusChromium.cpp:
(WebCore::AudioBus::loadPlatformResource):
* platform/chromium/PlatformSupport.h:
(PlatformSupport):
Source/WebKit/chromium:
* src/PlatformSupport.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115643 => 115644)
--- trunk/Source/WebCore/ChangeLog 2012-04-30 16:28:02 UTC (rev 115643)
+++ trunk/Source/WebCore/ChangeLog 2012-04-30 16:34:08 UTC (rev 115644)
@@ -1,5 +1,19 @@
2012-04-30 Mark Pilgrim <[email protected]>
+ [Chromium] Remove PlatformSupport::loadPlatformAudioResource, call loadResource directly
+ https://bugs.webkit.org/show_bug.cgi?id=85193
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * platform/audio/chromium/AudioBusChromium.cpp:
+ (WebCore::AudioBus::loadPlatformResource):
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+
+2012-04-30 Mark Pilgrim <[email protected]>
+
[Chromium] Call defaultLocale directly
https://bugs.webkit.org/show_bug.cgi?id=85192
Modified: trunk/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp (115643 => 115644)
--- trunk/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp 2012-04-30 16:28:02 UTC (rev 115643)
+++ trunk/Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp 2012-04-30 16:34:08 UTC (rev 115644)
@@ -30,14 +30,20 @@
#include "AudioFileReader.h"
#include "PlatformSupport.h"
+#include <public/Platform.h>
#include <wtf/PassOwnPtr.h>
namespace WebCore {
PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float sampleRate)
{
+ const WebKit::WebData& resource = WebKit::Platform::current()->loadResource(name);
+ if (resource.isEmpty())
+ return nullptr;
+
// FIXME: the sampleRate parameter is ignored. It should be removed from the API.
- OwnPtr<AudioBus> audioBus = PlatformSupport::loadPlatformAudioResource(name, sampleRate);
+ OwnPtr<AudioBus> audioBus = PlatformSupport::decodeAudioFileData(resource.data(), resource.size(), sampleRate);
+
if (!audioBus.get())
return nullptr;
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (115643 => 115644)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-30 16:28:02 UTC (rev 115643)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-30 16:34:08 UTC (rev 115644)
@@ -200,7 +200,6 @@
static PassRefPtr<Image> loadPlatformImageResource(const char* name);
#if ENABLE(WEB_AUDIO)
- static PassOwnPtr<AudioBus> loadPlatformAudioResource(const char* name, double sampleRate);
static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t, double sampleRate);
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (115643 => 115644)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 16:28:02 UTC (rev 115643)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 16:34:08 UTC (rev 115644)
@@ -1,5 +1,17 @@
2012-04-30 Mark Pilgrim <[email protected]>
+ [Chromium] Remove PlatformSupport::loadPlatformAudioResource, call loadResource directly
+ https://bugs.webkit.org/show_bug.cgi?id=85193
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
+2012-04-30 Mark Pilgrim <[email protected]>
+
[Chromium] Call defaultLocale directly
https://bugs.webkit.org/show_bug.cgi?id=85192
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (115643 => 115644)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-30 16:28:02 UTC (rev 115643)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-30 16:34:08 UTC (rev 115644)
@@ -571,15 +571,6 @@
#if ENABLE(WEB_AUDIO)
-PassOwnPtr<AudioBus> PlatformSupport::loadPlatformAudioResource(const char* name, double sampleRate)
-{
- const WebData& resource = webKitPlatformSupport()->loadResource(name);
- if (resource.isEmpty())
- return nullptr;
-
- return decodeAudioFileData(resource.data(), resource.size(), sampleRate);
-}
-
PassOwnPtr<AudioBus> PlatformSupport::decodeAudioFileData(const char* data, size_t size, double sampleRate)
{
WebAudioBus webAudioBus;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
