Merge WebKit at r78450: Initial merge by git.

Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1

8 files changed, 19 insertions, 14 deletions

diff --git a/Source/WebCore/webaudio/AudioBuffer.cpp b/Source/WebCore/webaudio/AudioBuffer.cpp
index f46d153..7075752 100644
--- a/Source/WebCore/webaudio/AudioBuffer.cpp
+++ b/Source/WebCore/webaudio/AudioBuffer.cpp
@@ -28,7 +28,7 @@
 
 #include "config.h"
 
-#if ENABLE(WEB_AUDIO) & ENABLE(3D_CANVAS)
+#if ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
 
 #include "AudioBuffer.h"
 
@@ -107,4 +107,4 @@ void AudioBuffer::zero()
 
 } // namespace WebCore
 
-#endif // ENABLE(WEB_AUDIO) & ENABLE(3D_CANVAS)
+#endif // ENABLE(WEB_AUDIO) & ENABLE(WEBGL)
diff --git a/Source/WebCore/webaudio/AudioBuffer.idl b/Source/WebCore/webaudio/AudioBuffer.idl
index e7353bf..594ee69 100644
--- a/Source/WebCore/webaudio/AudioBuffer.idl
+++ b/Source/WebCore/webaudio/AudioBuffer.idl
@@ -28,7 +28,7 @@
 
 module audio {
     interface [
-        Conditional=WEB_AUDIO & 3D_CANVAS
+        Conditional=WEB_AUDIO & WEBGL
     ] AudioBuffer {
         readonly attribute long length; // in sample-frames
         readonly attribute float duration; // in seconds
diff --git a/Source/WebCore/webaudio/AudioContext.cpp b/Source/WebCore/webaudio/AudioContext.cpp
index a452775..f25b494 100644
--- a/Source/WebCore/webaudio/AudioContext.cpp
+++ b/Source/WebCore/webaudio/AudioContext.cpp
@@ -41,6 +41,7 @@
 #include "ConvolverNode.h"
 #include "DelayNode.h"
 #include "Document.h"
+#include "FFTFrame.h"
 #include "HRTFDatabaseLoader.h"
 #include "HRTFPanner.h"
 #include "HighPass2FilterNode.h"
@@ -79,6 +80,8 @@ AudioContext::AudioContext(Document* document)
     // relax the check.
     relaxAdoptionRequirement();
     
+    FFTFrame::initialize();
+    
     m_destinationNode = AudioDestinationNode::create(this);
     m_listener = AudioListener::create();
     m_temporaryMonoBus = adoptPtr(new AudioBus(1, AudioNode::ProcessingSizeInFrames));
diff --git a/Source/WebCore/webaudio/AudioContext.idl b/Source/WebCore/webaudio/AudioContext.idl
index 9f0f49c..531774e 100644
--- a/Source/WebCore/webaudio/AudioContext.idl
+++ b/Source/WebCore/webaudio/AudioContext.idl
@@ -41,8 +41,10 @@ module webaudio {
         // All panning is relative to this listener.
         readonly attribute AudioListener listener;
 
-        AudioBuffer createBuffer(in unsigned long numberOfChannels, in unsigned long numberOfFrames, in float sampleRate);
-        AudioBuffer createBuffer(in ArrayBuffer buffer, in boolean mixToMono);
+        // AudioBuffer createBuffer(in unsigned long numberOfChannels, in unsigned long numberOfFrames, in float sampleRate);
+        // AudioBuffer createBuffer(in ArrayBuffer buffer, in boolean mixToMono);
+        [Custom] AudioBuffer createBuffer()
+            raises(DOMException);
 
         // Source
         AudioBufferSourceNode createBufferSource();
diff --git a/Source/WebCore/webaudio/RealtimeAnalyser.cpp b/Source/WebCore/webaudio/RealtimeAnalyser.cpp
index 30a7de1..1a1e920 100644
--- a/Source/WebCore/webaudio/RealtimeAnalyser.cpp
+++ b/Source/WebCore/webaudio/RealtimeAnalyser.cpp
@@ -32,7 +32,7 @@
 #include "AudioUtilities.h"
 #include "FFTFrame.h"
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(WEBGL)
 #include "Float32Array.h"
 #include "Uint8Array.h"
 #endif
@@ -193,7 +193,7 @@ void RealtimeAnalyser::doFFTAnalysis()
     }
 }
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(WEBGL)
 
 void RealtimeAnalyser::getFloatFrequencyData(Float32Array* destinationArray)
 {
@@ -294,7 +294,7 @@ void RealtimeAnalyser::getByteTimeDomainData(Uint8Array* destinationArray)
     }
 }
 
-#endif // 3D_CANVAS
+#endif // WEBGL
 
 } // namespace WebCore
 
diff --git a/Source/WebCore/webaudio/RealtimeAnalyser.h b/Source/WebCore/webaudio/RealtimeAnalyser.h
index c6ec2c0..84d2992 100644
--- a/Source/WebCore/webaudio/RealtimeAnalyser.h
+++ b/Source/WebCore/webaudio/RealtimeAnalyser.h
@@ -34,7 +34,7 @@ namespace WebCore {
 class AudioBus;
 class FFTFrame;
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(WEBGL)
 class Float32Array;
 class Uint8Array;
 #endif
@@ -61,7 +61,7 @@ public:
     void setSmoothingTimeConstant(float k) { m_smoothingTimeConstant = k; }
     float smoothingTimeConstant() const { return static_cast<float>(m_smoothingTimeConstant); }
 
-#if ENABLE(3D_CANVAS)
+#if ENABLE(WEBGL)
     void getFloatFrequencyData(Float32Array*);
     void getByteFrequencyData(Uint8Array*);
     void getByteTimeDomainData(Uint8Array*);
diff --git a/Source/WebCore/webaudio/RealtimeAnalyserNode.h b/Source/WebCore/webaudio/RealtimeAnalyserNode.h
index 9f62464..07488ee 100644
--- a/Source/WebCore/webaudio/RealtimeAnalyserNode.h
+++ b/Source/WebCore/webaudio/RealtimeAnalyserNode.h
@@ -59,7 +59,7 @@ public:
     void setSmoothingTimeConstant(float k) { m_analyser.setSmoothingTimeConstant(k); }
     float smoothingTimeConstant() const { return m_analyser.smoothingTimeConstant(); }
 
-#if ENABLE(3D_CANVAS)
+#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); }
diff --git a/Source/WebCore/webaudio/RealtimeAnalyserNode.idl b/Source/WebCore/webaudio/RealtimeAnalyserNode.idl
index 5b2b223..fdd8819 100644
--- a/Source/WebCore/webaudio/RealtimeAnalyserNode.idl
+++ b/Source/WebCore/webaudio/RealtimeAnalyserNode.idl
@@ -39,10 +39,10 @@ module audio {
         
         // 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=3D_CANVAS] void getFloatFrequencyData(in Float32Array array);
-        [Conditional=3D_CANVAS] void getByteFrequencyData(in Uint8Array array);
+        [Conditional=WEBGL] void getFloatFrequencyData(in Float32Array array);
+        [Conditional=WEBGL] void getByteFrequencyData(in Uint8Array array);
 
         // Real-time waveform data
-        [Conditional=3D_CANVAS] void getByteTimeDomainData(in Uint8Array array);
+        [Conditional=WEBGL] void getByteTimeDomainData(in Uint8Array array);
     };
 }