Attachment 139451 Details for Bug 85193 – Patch

[patch] Patch

bug-85193-20120430103247.patch (text/plain), 3.95 KB, created by Mark Pilgrim (Google) on 2012-04-30 07:32:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Pilgrim (Google)

Created: 2012-04-30 07:32:54 PDT

Size: 3.95 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 115630)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2012-04-30  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove PlatformSupport::loadPlatformAudioResource, call loadResource directly
>+        https://bugs.webkit.org/show_bug.cgi?id=85193
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  No'am Rosenthal  <noam.rosenthal@nokia.com>
> 
>         [Texmap] TextureMapperLayer uses intermediate surfaces too eagerly
>Index: Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
>===================================================================
>--- Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp	(revision 115625)
>+++ Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp	(working copy)
>@@ -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;
>     
>Index: Source/WebCore/platform/chromium/PlatformSupport.h
>===================================================================
>--- Source/WebCore/platform/chromium/PlatformSupport.h	(revision 115625)
>+++ Source/WebCore/platform/chromium/PlatformSupport.h	(working copy)
>@@ -203,7 +203,6 @@ public:
>     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
> 
>Index: Source/WebKit/chromium/ChangeLog
>===================================================================
>--- Source/WebKit/chromium/ChangeLog	(revision 115630)
>+++ Source/WebKit/chromium/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2012-04-30  Mark Pilgrim  <pilgrim@chromium.org>
>+
>+        [Chromium] Remove PlatformSupport::loadPlatformAudioResource, call loadResource directly
>+        https://bugs.webkit.org/show_bug.cgi?id=85193
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Part of a refactoring series. See tracking bug 82948.
>+
>+        * src/PlatformSupport.cpp:
>+        (WebCore):
>+
> 2012-04-30  Mark Pilgrim  <pilgrim@chromium.org>
> 
>         [Chromium] Use new syntax to call createSocketStreamHandle directly
>Index: Source/WebKit/chromium/src/PlatformSupport.cpp
>===================================================================
>--- Source/WebKit/chromium/src/PlatformSupport.cpp	(revision 115625)
>+++ Source/WebKit/chromium/src/PlatformSupport.cpp	(working copy)
>@@ -578,15 +578,6 @@ PassRefPtr<Image> PlatformSupport::loadP
> 
> #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;

Actions: View | Formatted Diff | Diff

Attachments on bug 85193: 139451