Changeset 87173 in webkit

Timestamp:

May 24, 2011 11:16:51 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-05-24 Zan Dobersek <​zandobersek@gmail.com> and Philippe Normand <​pnormand@igalia.com>

Reviewed by Kenneth Russell.

Enable FloatArray usage outside WebGL guards
​https://bugs.webkit.org/show_bug.cgi?id=61356

• webaudio/AudioBuffer.cpp:
• webaudio/AudioBuffer.idl:
• webaudio/RealtimeAnalyser.cpp:
• webaudio/RealtimeAnalyser.h:
• webaudio/RealtimeAnalyserNode.h:
• webaudio/RealtimeAnalyserNode.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• webaudio/AudioBuffer.cpp (modified) (2 diffs)
• webaudio/AudioBuffer.idl (modified) (1 diff)
• webaudio/RealtimeAnalyser.cpp (modified) (3 diffs)
• webaudio/RealtimeAnalyser.h (modified) (2 diffs)
• webaudio/RealtimeAnalyserNode.h (modified) (1 diff)
• webaudio/RealtimeAnalyserNode.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Zan Dobersek  <zandobersek@gmail.com> and Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Kenneth Russell.
+
+        Enable FloatArray usage outside WebGL guards
+        https://bugs.webkit.org/show_bug.cgi?id=61356
+
+        * webaudio/AudioBuffer.cpp:
+        * webaudio/AudioBuffer.idl:
+        * webaudio/RealtimeAnalyser.cpp:
+        * webaudio/RealtimeAnalyser.h:
+        * webaudio/RealtimeAnalyserNode.h:
+        * webaudio/RealtimeAnalyserNode.idl:
+
 2011-05-24  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/webaudio/AudioBuffer.cpp

@@ -29 +29 @@
 #include "config.h"
 
-#if ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
+#if ENABLE(WEB_AUDIO)
 
 #include "AudioBuffer.h"
@@ -108 +108 @@
 } // namespace WebCore
 
-#endif // ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
+#endif // ENABLE(WEB_AUDIO)

trunk/Source/WebCore/webaudio/AudioBuffer.idl

@@ -29 +29 @@
 module audio {
     interface [
-        Conditional=WEB_AUDIO & WEBGL
+        Conditional=WEB_AUDIO
     ] AudioBuffer {
         readonly attribute long length; // in sample-frames

trunk/Source/WebCore/webaudio/RealtimeAnalyser.cpp

@@ -32 +32 @@
 #include "AudioUtilities.h"
 #include "FFTFrame.h"
-
-#if ENABLE(WEBGL)
 #include "Float32Array.h"
 #include "Uint8Array.h"
-#endif
 
 #include <algorithm>
@@ -194 +191 @@
 }
 
-#if ENABLE(WEBGL)
-
 void RealtimeAnalyser::getFloatFrequencyData(Float32Array* destinationArray)
 {
@@ -295 +290 @@
 }
 
-#endif // WEBGL
-
 } // namespace WebCore
 

trunk/Source/WebCore/webaudio/RealtimeAnalyser.h

@@ -34 +34 @@
 class AudioBus;
 class FFTFrame;
-
-#if ENABLE(WEBGL)
 class Float32Array;
 class Uint8Array;
-#endif
 
 class RealtimeAnalyser {
@@ -62 +59 @@
     float smoothingTimeConstant() const { return static_cast<float>(m_smoothingTimeConstant); }
 
-#if ENABLE(WEBGL)
     void getFloatFrequencyData(Float32Array*);
     void getByteFrequencyData(Uint8Array*);
     void getByteTimeDomainData(Uint8Array*);
-#endif
 
     // The audio thread writes input data here.

trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.h

@@ -60 +60 @@
     float smoothingTimeConstant() const { return m_analyser.smoothingTimeConstant(); }
 
-#if ENABLE(WEBGL)
     void getFloatFrequencyData(Float32Array* array) { m_analyser.getFloatFrequencyData(array); }
     void getByteFrequencyData(Uint8Array* array) { m_analyser.getByteFrequencyData(array); }
     void getByteTimeDomainData(Uint8Array* array) { m_analyser.getByteTimeDomainData(array); }
-#endif
 
 private:

trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.idl

@@ -40 +40 @@
         // Copies the current frequency data into the passed array.
         // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
-        [Conditional=WEBGL] void getFloatFrequencyData(in Float32Array array);
-        [Conditional=WEBGL] void getByteFrequencyData(in Uint8Array array);
+        void getFloatFrequencyData(in Float32Array array);
+        void getByteFrequencyData(in Uint8Array array);
 
         // Real-time waveform data
-        [Conditional=WEBGL] void getByteTimeDomainData(in Uint8Array array);
+        void getByteTimeDomainData(in Uint8Array array);
     };
 }