Changeset 73193 in webkit
- Timestamp:
- Dec 2, 2010 1:35:25 PM (13 years ago)
- Location:
- trunk/WebKit/chromium
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r73190 r73193 1 2010-12-02 Chris Rogers <crogers@google.com> 2 3 Reviewed by Darin Fisher. 4 5 Fine-tune chromium WebKit API for loading audio resources 6 https://bugs.webkit.org/show_bug.cgi?id=50406 7 8 * public/WebAudioBus.h: 9 (WebKit::WebAudioBus::~WebAudioBus): 10 * public/WebKitClient.h: 11 (WebKit::WebKitClient::loadAudioResource): 12 * src/ChromiumBridge.cpp: 13 (WebCore::ChromiumBridge::decodeAudioFileData): 14 * src/WebAudioBus.cpp: 15 (WebKit::WebAudioBus::reset): 16 1 17 2010-12-02 Darin Fisher <darin@chromium.org> 2 18 -
trunk/WebKit/chromium/public/WebAudioBus.h
r72281 r73193 28 28 #include "WebCommon.h" 29 29 30 namespace WebCore { class AudioBus; } 31 30 32 #if WEBKIT_IMPLEMENTATION 31 namespace WebCore { class AudioBus; }32 33 namespace WTF { template <typename T> class PassOwnPtr; } 33 34 #endif … … 44 45 public: 45 46 WebAudioBus() : m_private(0) { } 46 ~WebAudioBus() ;47 ~WebAudioBus() { reset(); } 47 48 48 49 // initialize() allocates memory of the given length for the given number of channels. 49 void initialize(unsigned numberOfChannels, size_t length, double sampleRate);50 WEBKIT_API void initialize(unsigned numberOfChannels, size_t length, double sampleRate); 50 51 52 // reset() releases the memory allocated from initialize(). 53 WEBKIT_API void reset(); 54 51 55 WEBKIT_API unsigned numberOfChannels() const; 52 56 WEBKIT_API size_t length() const; … … 60 64 61 65 private: 62 // Noncopyable 63 WebAudioBus(const WebAudioBus& d) : m_private(0) { } 64 WebAudioBusPrivate* m_private; 66 // Disallow copy and assign. 67 WebAudioBus(const WebAudioBus&); 68 void operator=(const WebAudioBus&); 69 70 WebCore::AudioBus* m_private; 65 71 }; 66 72 -
trunk/WebKit/chromium/public/WebKitClient.h
r73137 r73193 226 226 // A sample-rate conversion to sampleRate will occur if the file data is at a different sample-rate. 227 227 // Returns true on success. 228 virtual bool decodeAudioFileData(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; }228 virtual bool loadAudioResource(WebAudioBus* destinationBus, const char* audioFileData, size_t dataSize, double sampleRate) { return false; } 229 229 230 230 // Returns a localized string resource (with substitution parameters). -
trunk/WebKit/chromium/src/ChromiumBridge.cpp
r73137 r73193 637 637 { 638 638 WebAudioBus webAudioBus; 639 if (webKitClient()-> decodeAudioFileData(&webAudioBus, data, size, sampleRate))639 if (webKitClient()->loadAudioResource(&webAudioBus, data, size, sampleRate)) 640 640 return webAudioBus.release(); 641 641 return 0; -
trunk/WebKit/chromium/src/WebAudioBus.cpp
r72281 r73193 45 45 }; 46 46 47 WebAudioBus::~WebAudioBus()48 {49 #if ENABLE(WEB_AUDIO)50 delete m_private;51 m_private = 0;52 #endif53 }54 55 47 void WebAudioBus::initialize(unsigned numberOfChannels, size_t length, double sampleRate) 56 48 { … … 62 54 delete m_private; 63 55 m_private = static_cast<WebAudioBusPrivate*>(audioBus); 56 #else 57 ASSERT_NOT_REACHED(); 58 #endif 59 } 60 61 void WebAudioBus::reset() 62 { 63 #if ENABLE(WEB_AUDIO) 64 delete m_private; 65 m_private = 0; 64 66 #else 65 67 ASSERT_NOT_REACHED();
Note: See TracChangeset
for help on using the changeset viewer.