Changeset 90853 in webkit

Timestamp:

Jul 12, 2011 2:46:35 PM (13 years ago)

Author:

crogers@google.com

Message:

AudioDevice::Stop can close NULL handle.
​https://bugs.webkit.org/show_bug.cgi?id=64157

Reviewed by Kenneth Russell.

No new tests since audio API is not yet implemented.

• bindings/js/JSAudioContextCustom.cpp:

(WebCore::JSAudioContextConstructor::constructJSAudioContext):

• bindings/v8/custom/V8AudioContextCustom.cpp:

(WebCore::V8AudioContext::constructorCallback):

• webaudio/AudioContext.cpp:

(WebCore::AudioContext::create):
(WebCore::AudioContext::uninitialize):

• webaudio/AudioContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSAudioContextCustom.cpp (modified) (1 diff)
• bindings/v8/custom/V8AudioContextCustom.cpp (modified) (1 diff)
• webaudio/AudioContext.cpp (modified) (3 diffs)
• webaudio/AudioContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-12  Chris Rogers  <crogers@google.com>
+
+        AudioDevice::Stop can close NULL handle.
+        https://bugs.webkit.org/show_bug.cgi?id=64157
+
+        Reviewed by Kenneth Russell.
+
+        No new tests since audio API is not yet implemented.
+
+        * bindings/js/JSAudioContextCustom.cpp:
+        (WebCore::JSAudioContextConstructor::constructJSAudioContext):
+        * bindings/v8/custom/V8AudioContextCustom.cpp:
+        (WebCore::V8AudioContext::constructorCallback):
+        * webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::create):
+        (WebCore::AudioContext::uninitialize):
+        * webaudio/AudioContext.h:
+
 2011-07-12  John Bates  <jbates@google.com>
 

trunk/Source/WebCore/bindings/js/JSAudioContextCustom.cpp

@@ -69 +69 @@
         // Constructor for default AudioContext which talks to audio hardware.
         audioContext = AudioContext::create(document);
+        if (!audioContext.get())
+            return throwVMError(exec, createSyntaxError(exec, "audio resources unavailable for AudioContext construction"));
     } else {
         // Constructor for offline (render-target) AudioContext which renders into an AudioBuffer.

trunk/Source/WebCore/bindings/v8/custom/V8AudioContextCustom.cpp

@@ -60 +60 @@
         // Constructor for default AudioContext which talks to audio hardware.
         audioContext = AudioContext::create(document);
+        if (!audioContext.get())
+            return throwError("audio resources unavailable for AudioContext construction", V8Proxy::SyntaxError);
     } else {
         // Constructor for offline (render-target) AudioContext which renders into an AudioBuffer.

trunk/Source/WebCore/webaudio/AudioContext.cpp

@@ -83 +83 @@
 }
 
+// Don't allow more than this number of simultaneous AudioContexts talking to hardware.
+const unsigned MaxHardwareContexts = 4;
+unsigned AudioContext::s_hardwareContextCount = 0;
+    
 PassRefPtr<AudioContext> AudioContext::create(Document* document)
 {
     ASSERT(document);
+    ASSERT(isMainThread());
+    if (s_hardwareContextCount >= MaxHardwareContexts)
+        return 0;
+
+    ++s_hardwareContextCount;
+        
     return adoptRef(new AudioContext(document));
 }
@@ -195 +205 @@
 void AudioContext::uninitialize()
 {
+    ASSERT(isMainThread());
+
     if (m_isInitialized) {    
         // This stops the audio thread and all audio rendering.
@@ -204 +216 @@
         // We have to release our reference to the destination node before the context will ever be deleted since the destination node holds a reference to the context.
         m_destinationNode.clear();
+
+        if (!isOfflineContext()) {
+            ASSERT(s_hardwareContextCount);
+            --s_hardwareContextCount;
+        }
         
         // Get rid of the sources which may still be playing.

trunk/Source/WebCore/webaudio/AudioContext.h

@@ -214 +214 @@
     void fireCompletionEvent();
     
+    static unsigned s_hardwareContextCount;
+    
 private:
     AudioContext(Document*);