Changeset 73193 in webkit

Timestamp:

Dec 2, 2010 1:35:25 PM (13 years ago)

Author:

crogers@google.com

Message:

2010-12-02 Chris Rogers <​crogers@google.com>

Reviewed by Darin Fisher.

Fine-tune chromium WebKit API for loading audio resources
​https://bugs.webkit.org/show_bug.cgi?id=50406

• public/WebAudioBus.h: (WebKit::WebAudioBus::~WebAudioBus):
• public/WebKitClient.h: (WebKit::WebKitClient::loadAudioResource):
• src/ChromiumBridge.cpp: (WebCore::ChromiumBridge::decodeAudioFileData):
• src/WebAudioBus.cpp: (WebKit::WebAudioBus::reset):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebAudioBus.h (modified) (3 diffs)
• public/WebKitClient.h (modified) (1 diff)
• src/ChromiumBridge.cpp (modified) (1 diff)
• src/WebAudioBus.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-12-02  Chris Rogers  <crogers@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Fine-tune chromium WebKit API for loading audio resources
+        https://bugs.webkit.org/show_bug.cgi?id=50406
+
+        * public/WebAudioBus.h:
+        (WebKit::WebAudioBus::~WebAudioBus):
+        * public/WebKitClient.h:
+        (WebKit::WebKitClient::loadAudioResource):
+        * src/ChromiumBridge.cpp:
+        (WebCore::ChromiumBridge::decodeAudioFileData):
+        * src/WebAudioBus.cpp:
+        (WebKit::WebAudioBus::reset):
+
 2010-12-02  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/public/WebAudioBus.h

@@ -28 +28 @@
 #include "WebCommon.h"
 
+namespace WebCore { class AudioBus; }
+
 #if WEBKIT_IMPLEMENTATION
-namespace WebCore { class AudioBus; }
 namespace WTF { template <typename T> class PassOwnPtr; }
 #endif
@@ -44 +45 @@
 public:
     WebAudioBus() : m_private(0) { }
-    ~WebAudioBus();
+    ~WebAudioBus() { reset(); }
     
     // initialize() allocates memory of the given length for the given number of channels.
-    void initialize(unsigned numberOfChannels, size_t length, double sampleRate);
+    WEBKIT_API void initialize(unsigned numberOfChannels, size_t length, double sampleRate);
 
+    // reset() releases the memory allocated from initialize().
+    WEBKIT_API void reset();
+    
     WEBKIT_API unsigned numberOfChannels() const;
     WEBKIT_API size_t length() const;
@@ -60 +64 @@
 
 private:
-    // Noncopyable
-    WebAudioBus(const WebAudioBus& d) : m_private(0) { }
-    WebAudioBusPrivate* m_private;
+    // Disallow copy and assign.
+    WebAudioBus(const WebAudioBus&);
+    void operator=(const WebAudioBus&);
+
+    WebCore::AudioBus* m_private;
 };
 

trunk/WebKit/chromium/public/WebKitClient.h

@@ -226 +226 @@
     // A sample-rate conversion to sampleRate will occur if the file data is at a different sample-rate.
     // Returns true on success.
-    virtual bool decodeAudioFileData(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; }
+    virtual bool loadAudioResource(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; }
 
     // Returns a localized string resource (with substitution parameters).

trunk/WebKit/chromium/src/ChromiumBridge.cpp

@@ -637 +637 @@
 {
     WebAudioBus webAudioBus;
-    if (webKitClient()->decodeAudioFileData(&webAudioBus, data, size, sampleRate))
+    if (webKitClient()->loadAudioResource(&webAudioBus, data, size, sampleRate))
         return webAudioBus.release();
     return 0;

trunk/WebKit/chromium/src/WebAudioBus.cpp

@@ -45 +45 @@
 };
 
-WebAudioBus::~WebAudioBus()
-{
-#if ENABLE(WEB_AUDIO)
-    delete m_private;
-    m_private = 0;
-#endif
-}
-
 void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sampleRate)
 {        
@@ -62 +54 @@
         delete m_private;
     m_private = static_cast<WebAudioBusPrivate*>(audioBus);
+#else
+    ASSERT_NOT_REACHED();
+#endif
+}
+
+void WebAudioBus::reset()
+{
+#if ENABLE(WEB_AUDIO)
+    delete m_private;
+    m_private = 0;
 #else
     ASSERT_NOT_REACHED();