Diff
Modified: trunk/Source/WebCore/ChangeLog (87172 => 87173)
--- trunk/Source/WebCore/ChangeLog 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/ChangeLog 2011-05-24 18:16:51 UTC (rev 87173)
@@ -1,3 +1,17 @@
+2011-05-24 Zan Dobersek <[email protected]> and Philippe Normand <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r87145.
Modified: trunk/Source/WebCore/webaudio/AudioBuffer.cpp (87172 => 87173)
--- trunk/Source/WebCore/webaudio/AudioBuffer.cpp 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/AudioBuffer.cpp 2011-05-24 18:16:51 UTC (rev 87173)
@@ -28,7 +28,7 @@
#include "config.h"
-#if ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
+#if ENABLE(WEB_AUDIO)
#include "AudioBuffer.h"
@@ -107,4 +107,4 @@
} // namespace WebCore
-#endif // ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
+#endif // ENABLE(WEB_AUDIO)
Modified: trunk/Source/WebCore/webaudio/AudioBuffer.idl (87172 => 87173)
--- trunk/Source/WebCore/webaudio/AudioBuffer.idl 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/AudioBuffer.idl 2011-05-24 18:16:51 UTC (rev 87173)
@@ -28,7 +28,7 @@
module audio {
interface [
- Conditional=WEB_AUDIO & WEBGL
+ Conditional=WEB_AUDIO
] AudioBuffer {
readonly attribute long length; // in sample-frames
readonly attribute float duration; // in seconds
Modified: trunk/Source/WebCore/webaudio/RealtimeAnalyser.cpp (87172 => 87173)
--- trunk/Source/WebCore/webaudio/RealtimeAnalyser.cpp 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/RealtimeAnalyser.cpp 2011-05-24 18:16:51 UTC (rev 87173)
@@ -31,11 +31,8 @@
#include "AudioBus.h"
#include "AudioUtilities.h"
#include "FFTFrame.h"
-
-#if ENABLE(WEBGL)
#include "Float32Array.h"
#include "Uint8Array.h"
-#endif
#include <algorithm>
#include <limits.h>
@@ -193,8 +190,6 @@
}
}
-#if ENABLE(WEBGL)
-
void RealtimeAnalyser::getFloatFrequencyData(Float32Array* destinationArray)
{
ASSERT(isMainThread());
@@ -294,8 +289,6 @@
}
}
-#endif // WEBGL
-
} // namespace WebCore
#endif // ENABLE(WEB_AUDIO)
Modified: trunk/Source/WebCore/webaudio/RealtimeAnalyser.h (87172 => 87173)
--- trunk/Source/WebCore/webaudio/RealtimeAnalyser.h 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/RealtimeAnalyser.h 2011-05-24 18:16:51 UTC (rev 87173)
@@ -33,11 +33,8 @@
class AudioBus;
class FFTFrame;
-
-#if ENABLE(WEBGL)
class Float32Array;
class Uint8Array;
-#endif
class RealtimeAnalyser {
WTF_MAKE_NONCOPYABLE(RealtimeAnalyser);
@@ -61,11 +58,9 @@
void setSmoothingTimeConstant(float k) { m_smoothingTimeConstant = k; }
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.
void writeInput(AudioBus*, size_t framesToProcess);
Modified: trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.h (87172 => 87173)
--- trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.h 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.h 2011-05-24 18:16:51 UTC (rev 87173)
@@ -59,11 +59,9 @@
void setSmoothingTimeConstant(float k) { m_analyser.setSmoothingTimeConstant(k); }
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:
RealtimeAnalyserNode(AudioContext*, double sampleRate);
Modified: trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.idl (87172 => 87173)
--- trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.idl 2011-05-24 18:12:39 UTC (rev 87172)
+++ trunk/Source/WebCore/webaudio/RealtimeAnalyserNode.idl 2011-05-24 18:16:51 UTC (rev 87173)
@@ -39,10 +39,10 @@
// 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);
};
}
