Rename some AudioNodes

author crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)

committer crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)
author crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)
committer crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt

index da0f3844571c0eb64b29f516e3da15713e4af4b0..f0fe4a94dd8776128f9b6719a896c1916bdcad9b 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -262,15 +262,15 @@ SET(WebCore_IDL_FILES
      Modules/webaudio/AudioBuffer.idl
      Modules/webaudio/AudioBufferCallback.idl
      Modules/webaudio/AudioBufferSourceNode.idl
-    Modules/webaudio/AudioChannelSplitter.idl
-    Modules/webaudio/AudioChannelMerger.idl
+    Modules/webaudio/ChannelSplitterNode.idl
+    Modules/webaudio/ChannelMergerNode.idl
      Modules/webaudio/AudioContext.idl
      Modules/webaudio/AudioDestinationNode.idl
      Modules/webaudio/AudioGain.idl
-    Modules/webaudio/AudioGainNode.idl
+    Modules/webaudio/GainNode.idl
      Modules/webaudio/AudioListener.idl
      Modules/webaudio/AudioNode.idl
-    Modules/webaudio/AudioPannerNode.idl
+    Modules/webaudio/PannerNode.idl
      Modules/webaudio/AudioParam.idl
      Modules/webaudio/AudioProcessingEvent.idl
      Modules/webaudio/AudioSourceNode.idl
@@ -279,12 +279,12 @@ SET(WebCore_IDL_FILES
      Modules/webaudio/DOMWindowWebAudio.idl
      Modules/webaudio/DelayNode.idl
      Modules/webaudio/DynamicsCompressorNode.idl
-    Modules/webaudio/JavaScriptAudioNode.idl
+    Modules/webaudio/ScriptProcessorNode.idl
      Modules/webaudio/MediaElementAudioSourceNode.idl
      Modules/webaudio/MediaStreamAudioSourceNode.idl
      Modules/webaudio/OfflineAudioCompletionEvent.idl
-    Modules/webaudio/Oscillator.idl
-    Modules/webaudio/RealtimeAnalyserNode.idl
+    Modules/webaudio/OscillatorNode.idl
+    Modules/webaudio/AnalyserNode.idl
      Modules/webaudio/WaveShaperNode.idl
      Modules/webaudio/WaveTable.idl
  
@@ -906,16 +906,16 @@ SET(WebCore_SOURCES
      Modules/webaudio/AudioBasicProcessorNode.cpp
      Modules/webaudio/AudioBuffer.cpp
      Modules/webaudio/AudioBufferSourceNode.cpp
-    Modules/webaudio/AudioChannelMerger.cpp
-    Modules/webaudio/AudioChannelSplitter.cpp
+    Modules/webaudio/ChannelMergerNode.cpp
+    Modules/webaudio/ChannelSplitterNode.cpp
      Modules/webaudio/AudioContext.cpp
      Modules/webaudio/AudioDestinationNode.cpp
-    Modules/webaudio/AudioGainNode.cpp
+    Modules/webaudio/GainNode.cpp
      Modules/webaudio/AudioListener.cpp
      Modules/webaudio/AudioNode.cpp
      Modules/webaudio/AudioNodeInput.cpp
      Modules/webaudio/AudioNodeOutput.cpp
-    Modules/webaudio/AudioPannerNode.cpp
+    Modules/webaudio/PannerNode.cpp
      Modules/webaudio/AudioParam.cpp
      Modules/webaudio/AudioParamTimeline.cpp
      Modules/webaudio/AudioProcessingEvent.cpp
@@ -930,14 +930,14 @@ SET(WebCore_SOURCES
      Modules/webaudio/DelayNode.cpp
      Modules/webaudio/DelayProcessor.cpp
      Modules/webaudio/DynamicsCompressorNode.cpp
-    Modules/webaudio/JavaScriptAudioNode.cpp
+    Modules/webaudio/ScriptProcessorNode.cpp
      Modules/webaudio/MediaElementAudioSourceNode.cpp
      Modules/webaudio/MediaStreamAudioSourceNode.cpp
      Modules/webaudio/OfflineAudioCompletionEvent.cpp
      Modules/webaudio/OfflineAudioDestinationNode.cpp
-    Modules/webaudio/Oscillator.cpp
+    Modules/webaudio/OscillatorNode.cpp
      Modules/webaudio/RealtimeAnalyser.cpp
-    Modules/webaudio/RealtimeAnalyserNode.cpp
+    Modules/webaudio/AnalyserNode.cpp
      Modules/webaudio/WaveShaperDSPKernel.cpp
      Modules/webaudio/WaveShaperNode.cpp
      Modules/webaudio/WaveShaperProcessor.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index 237d404c76718a1445837eeebecc5051e1592806..bd12fb6fe078105afeada0b9010e7e386bc16220 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,90 @@
+2012-10-16  Chris Rogers  <crogers@google.com>
+
+        Rename some AudioNodes
+        https://bugs.webkit.org/show_bug.cgi?id=99358
+
+        Reviewed by Daniel Bates.
+
+        Here's a list of the node names, showing the changing ones:
+            AudioBufferSourceNode
+            MediaElementAudioSourceNode
+            MediaStreamAudioSourceNode
+            JavaScriptAudioNode ------------> ScriptProcessorNode
+            RealtimeAnalyserNode ------------> AnalyserNode
+            AudioGainNode ------------> GainNode
+            DelayNode
+            BiquadFilterNode
+            AudioPannerNode ------------> PannerNode
+            ConvolverNode
+            AudioChannelSplitter ------------> ChannelSplitterNode
+            AudioChannelMerger ------------> ChannelMergerNode
+            DynamicsCompressorNode
+            Oscillator ------------> OscillatorNode
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.list.am:
+        * Modules/webaudio/AnalyserNode.cpp: Renamed from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp.
+        * Modules/webaudio/AnalyserNode.idl: Renamed from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl.
+        * Modules/webaudio/AudioBufferSourceNode.cpp:
+        (WebCore::AudioBufferSourceNode::setPannerNode):
+        * Modules/webaudio/AudioBufferSourceNode.h:
+        (AudioBufferSourceNode):
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::createJavaScriptNode):
+        (WebCore::AudioContext::createPanner):
+        (WebCore::AudioContext::createAnalyser):
+        (WebCore::AudioContext::createGainNode):
+        (WebCore::AudioContext::createChannelSplitter):
+        (WebCore::AudioContext::createChannelMerger):
+        (WebCore::AudioContext::createOscillator):
+        * Modules/webaudio/AudioContext.h:
+        (WebCore):
+        (AudioContext):
+        * Modules/webaudio/AudioContext.idl:
+        * Modules/webaudio/ChannelMergerNode.cpp: Renamed from Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp.
+        * Modules/webaudio/ChannelMergerNode.h: Renamed from Source/WebCore/Modules/webaudio/AudioChannelMerger.h.
+        (WebCore):
+        (ChannelMergerNode):
+        * Modules/webaudio/ChannelMergerNode.idl: Renamed from Source/WebCore/Modules/webaudio/AudioChannelMerger.idl.
+        * Modules/webaudio/ChannelSplitterNode.cpp: Renamed from Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp.
+        * Modules/webaudio/ChannelSplitterNode.h: Renamed from Source/WebCore/Modules/webaudio/AudioChannelSplitter.h.
+        (WebCore):
+        (ChannelSplitterNode):
+        * Modules/webaudio/ChannelSplitterNode.idl: Renamed from Source/WebCore/Modules/webaudio/AudioChannelSplitter.idl.
+        * Modules/webaudio/DOMWindowWebAudio.idl:
+        * Modules/webaudio/GainNode.cpp: Renamed from Source/WebCore/Modules/webaudio/AudioGainNode.cpp.
+        * Modules/webaudio/GainNode.h: Renamed from Source/WebCore/Modules/webaudio/AudioGainNode.h.
+        * Modules/webaudio/GainNode.idl: Renamed from Source/WebCore/Modules/webaudio/AudioGainNode.idl.
+        * Modules/webaudio/OscillatorNode.cpp: Renamed from Source/WebCore/Modules/webaudio/Oscillator.cpp.
+        * Modules/webaudio/OscillatorNode.h: Renamed from Source/WebCore/Modules/webaudio/Oscillator.h.
+        * Modules/webaudio/OscillatorNode.idl: Renamed from Source/WebCore/Modules/webaudio/Oscillator.idl.
+        * Modules/webaudio/PannerNode.cpp: Renamed from Source/WebCore/Modules/webaudio/AudioPannerNode.cpp.
+        * Modules/webaudio/PannerNode.h: Renamed from Source/WebCore/Modules/webaudio/AudioPannerNode.h.
+        (WebCore):
+        * Modules/webaudio/PannerNode.idl: Renamed from Source/WebCore/Modules/webaudio/AudioPannerNode.idl.
+        * Modules/webaudio/ScriptProcessorNode.cpp: Renamed from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp.
+        * Modules/webaudio/ScriptProcessorNode.h: Renamed from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h.
+        (WebCore):
+        * Modules/webaudio/ScriptProcessorNode.idl: Renamed from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.idl.
+        * Modules/webaudio/WaveTable.cpp:
+        (WebCore::WaveTable::createSine):
+        (WebCore::WaveTable::createSquare):
+        (WebCore::WaveTable::createSawtooth):
+        (WebCore::WaveTable::createTriangle):
+        (WebCore::WaveTable::generateBasicWaveform):
+        * Target.pri:
+        * UseJSC.cmake:
+        * WebCore.gypi:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSScriptProcessorNodeCustom.cpp: Renamed from Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp.
+        (WebCore):
+        (WebCore::JSScriptProcessorNode::visitChildren):
+        * dom/EventTarget.h:
+        (WebCore):
+        * dom/EventTargetFactory.in:
+
  2012-10-16  Noam Rosenthal  <noam.rosenthal@nokia.com>
  
          [Texmap] Refactor TextureMapperShaderManager to be clearer
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make

index 9a97c17c691a336af97f96e5734f47aa8e64cc9d..4de8ce767138f5866e48d8d97cfa4a35e56532e5 100644 (file)
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -122,15 +122,15 @@ BINDING_IDLS = \
      $(WebCore)/Modules/webaudio/AudioBuffer.idl \
      $(WebCore)/Modules/webaudio/AudioBufferCallback.idl \
      $(WebCore)/Modules/webaudio/AudioBufferSourceNode.idl \
-    $(WebCore)/Modules/webaudio/AudioChannelMerger.idl \
-    $(WebCore)/Modules/webaudio/AudioChannelSplitter.idl \
+    $(WebCore)/Modules/webaudio/ChannelMergerNode.idl \
+    $(WebCore)/Modules/webaudio/ChannelSplitterNode.idl \
      $(WebCore)/Modules/webaudio/AudioContext.idl \
      $(WebCore)/Modules/webaudio/AudioDestinationNode.idl \
      $(WebCore)/Modules/webaudio/AudioGain.idl \
-    $(WebCore)/Modules/webaudio/AudioGainNode.idl \
+    $(WebCore)/Modules/webaudio/GainNode.idl \
      $(WebCore)/Modules/webaudio/AudioListener.idl \
      $(WebCore)/Modules/webaudio/AudioNode.idl \
-    $(WebCore)/Modules/webaudio/AudioPannerNode.idl \
+    $(WebCore)/Modules/webaudio/PannerNode.idl \
      $(WebCore)/Modules/webaudio/AudioParam.idl \
      $(WebCore)/Modules/webaudio/AudioProcessingEvent.idl \
      $(WebCore)/Modules/webaudio/AudioSourceNode.idl \
@@ -139,12 +139,12 @@ BINDING_IDLS = \
      $(WebCore)/Modules/webaudio/DOMWindowWebAudio.idl \
      $(WebCore)/Modules/webaudio/DelayNode.idl \
      $(WebCore)/Modules/webaudio/DynamicsCompressorNode.idl \
-    $(WebCore)/Modules/webaudio/JavaScriptAudioNode.idl \
+    $(WebCore)/Modules/webaudio/ScriptProcessorNode.idl \
      $(WebCore)/Modules/webaudio/MediaElementAudioSourceNode.idl \
      $(WebCore)/Modules/webaudio/MediaStreamAudioSourceNode.idl \
-    $(WebCore)/Modules/webaudio/Oscillator.idl \
+    $(WebCore)/Modules/webaudio/OscillatorNode.idl \
      $(WebCore)/Modules/webaudio/OfflineAudioCompletionEvent.idl \
-    $(WebCore)/Modules/webaudio/RealtimeAnalyserNode.idl \
+    $(WebCore)/Modules/webaudio/AnalyserNode.idl \
      $(WebCore)/Modules/webaudio/WaveShaperNode.idl \
      $(WebCore)/Modules/webaudio/WaveTable.idl \
      $(WebCore)/Modules/webdatabase/DOMWindowWebDatabase.idl \
diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri

index 810aded8a5be41b9629ad2800f5a8ffb72a1e2da..5dfbf9b32eacf8f5dff48e079e072a534a53ff86 100644 (file)
--- a/Source/WebCore/DerivedSources.pri
+++ b/Source/WebCore/DerivedSources.pri
@@ -139,15 +139,15 @@ IDL_BINDINGS += \
      $$PWD/Modules/webaudio/AudioBuffer.idl \
      $$PWD/Modules/webaudio/AudioBufferCallback.idl \
      $$PWD/Modules/webaudio/AudioBufferSourceNode.idl \
-    $$PWD/Modules/webaudio/AudioChannelMerger.idl \
-    $$PWD/Modules/webaudio/AudioChannelSplitter.idl \
+    $$PWD/Modules/webaudio/ChannelMergerNode.idl \
+    $$PWD/Modules/webaudio/ChannelSplitterNode.idl \
      $$PWD/Modules/webaudio/AudioContext.idl \
      $$PWD/Modules/webaudio/AudioDestinationNode.idl \
      $$PWD/Modules/webaudio/AudioGain.idl \
-    $$PWD/Modules/webaudio/AudioGainNode.idl \
+    $$PWD/Modules/webaudio/GainNode.idl \
      $$PWD/Modules/webaudio/AudioListener.idl \
      $$PWD/Modules/webaudio/AudioNode.idl \
-    $$PWD/Modules/webaudio/AudioPannerNode.idl \
+    $$PWD/Modules/webaudio/PannerNode.idl \
      $$PWD/Modules/webaudio/AudioParam.idl \
      $$PWD/Modules/webaudio/AudioProcessingEvent.idl \
      $$PWD/Modules/webaudio/AudioSourceNode.idl \
@@ -156,12 +156,12 @@ IDL_BINDINGS += \
      $$PWD/Modules/webaudio/DelayNode.idl \
      $$PWD/Modules/webaudio/DOMWindowWebAudio.idl \
      $$PWD/Modules/webaudio/DynamicsCompressorNode.idl \
-    $$PWD/Modules/webaudio/JavaScriptAudioNode.idl \
+    $$PWD/Modules/webaudio/ScriptProcessorNode.idl \
      $$PWD/Modules/webaudio/MediaElementAudioSourceNode.idl \
      $$PWD/Modules/webaudio/MediaStreamAudioSourceNode.idl \
      $$PWD/Modules/webaudio/OfflineAudioCompletionEvent.idl \
-    $$PWD/Modules/webaudio/Oscillator.idl \
-    $$PWD/Modules/webaudio/RealtimeAnalyserNode.idl \
+    $$PWD/Modules/webaudio/OscillatorNode.idl \
+    $$PWD/Modules/webaudio/AnalyserNode.idl \
      $$PWD/Modules/webaudio/WaveShaperNode.idl \
      $$PWD/Modules/webaudio/WaveTable.idl \
      $$PWD/Modules/webdatabase/DOMWindowWebDatabase.idl \
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am

index c45f5c68abddf4da9b6abb771d5482414d0c643d..40f1391f19bde7fe99b1cf2ee7744d14e7d73c8a 100644 (file)
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -43,24 +43,24 @@ webcore_built_sources += \
         DerivedSources/WebCore/JSAudioBufferCallback.h \
         DerivedSources/WebCore/JSAudioBufferSourceNode.cpp \
         DerivedSources/WebCore/JSAudioBufferSourceNode.h \
-       DerivedSources/WebCore/JSAudioChannelMerger.cpp \
-       DerivedSources/WebCore/JSAudioChannelMerger.h \
-       DerivedSources/WebCore/JSAudioChannelSplitter.cpp \
-       DerivedSources/WebCore/JSAudioChannelSplitter.h \
+       DerivedSources/WebCore/JSChannelMergerNode.cpp \
+       DerivedSources/WebCore/JSChannelMergerNode.h \
+       DerivedSources/WebCore/JSChannelSplitterNode.cpp \
+       DerivedSources/WebCore/JSChannelSplitterNode.h \
         DerivedSources/WebCore/JSAudioContext.cpp \
         DerivedSources/WebCore/JSAudioContext.h \
         DerivedSources/WebCore/JSAudioDestinationNode.cpp \
         DerivedSources/WebCore/JSAudioDestinationNode.h \
         DerivedSources/WebCore/JSAudioGain.cpp \
         DerivedSources/WebCore/JSAudioGain.h \
-       DerivedSources/WebCore/JSAudioGainNode.cpp \
-       DerivedSources/WebCore/JSAudioGainNode.h \
+       DerivedSources/WebCore/JSGainNode.cpp \
+       DerivedSources/WebCore/JSGainNode.h \
         DerivedSources/WebCore/JSAudioListener.cpp \
         DerivedSources/WebCore/JSAudioListener.h \
         DerivedSources/WebCore/JSAudioNode.cpp \
         DerivedSources/WebCore/JSAudioNode.h \
-       DerivedSources/WebCore/JSAudioPannerNode.cpp \
-       DerivedSources/WebCore/JSAudioPannerNode.h \
+       DerivedSources/WebCore/JSPannerNode.cpp \
+       DerivedSources/WebCore/JSPannerNode.h \
         DerivedSources/WebCore/JSAudioParam.cpp \
         DerivedSources/WebCore/JSAudioParam.h \
         DerivedSources/WebCore/JSAudioProcessingEvent.cpp \
@@ -487,8 +487,8 @@ webcore_built_sources += \
         DerivedSources/WebCore/JSInt32Array.h \
         DerivedSources/WebCore/JSInt8Array.cpp \
         DerivedSources/WebCore/JSInt8Array.h \
-       DerivedSources/WebCore/JSJavaScriptAudioNode.cpp \
-       DerivedSources/WebCore/JSJavaScriptAudioNode.h \
+       DerivedSources/WebCore/JSScriptProcessorNode.cpp \
+       DerivedSources/WebCore/JSScriptProcessorNode.h \
         DerivedSources/WebCore/JSJavaScriptCallFrame.cpp \
         DerivedSources/WebCore/JSJavaScriptCallFrame.h \
         DerivedSources/WebCore/JSKeyboardEvent.cpp \
@@ -581,8 +581,8 @@ webcore_built_sources += \
         DerivedSources/WebCore/JSOESVertexArrayObject.h \
         DerivedSources/WebCore/JSOfflineAudioCompletionEvent.cpp \
         DerivedSources/WebCore/JSOfflineAudioCompletionEvent.h \
-       DerivedSources/WebCore/JSOscillator.cpp \
-       DerivedSources/WebCore/JSOscillator.h \
+       DerivedSources/WebCore/JSOscillatorNode.cpp \
+       DerivedSources/WebCore/JSOscillatorNode.h \
         DerivedSources/WebCore/JSOverflowEvent.cpp \
         DerivedSources/WebCore/JSOverflowEvent.h \
         DerivedSources/WebCore/JSPageTransitionEvent.cpp \
@@ -619,8 +619,8 @@ webcore_built_sources += \
         DerivedSources/WebCore/JSRangeException.cpp \
         DerivedSources/WebCore/JSRangeException.h \
         DerivedSources/WebCore/JSRange.h \
-       DerivedSources/WebCore/JSRealtimeAnalyserNode.cpp \
-       DerivedSources/WebCore/JSRealtimeAnalyserNode.h \
+       DerivedSources/WebCore/JSAnalyserNode.cpp \
+       DerivedSources/WebCore/JSAnalyserNode.h \
         DerivedSources/WebCore/JSRect.cpp \
         DerivedSources/WebCore/JSRect.h \
         DerivedSources/WebCore/JSRequestAnimationFrameCallback.cpp \
@@ -1265,15 +1265,15 @@ dom_binding_idls += \
         $(WebCore)/Modules/webaudio/AudioBuffer.idl \
         $(WebCore)/Modules/webaudio/AudioBufferCallback.idl \
         $(WebCore)/Modules/webaudio/AudioBufferSourceNode.idl \
-       $(WebCore)/Modules/webaudio/AudioChannelMerger.idl \
-       $(WebCore)/Modules/webaudio/AudioChannelSplitter.idl \
+       $(WebCore)/Modules/webaudio/ChannelMergerNode.idl \
+       $(WebCore)/Modules/webaudio/ChannelSplitterNode.idl \
         $(WebCore)/Modules/webaudio/AudioContext.idl \
         $(WebCore)/Modules/webaudio/AudioDestinationNode.idl \
         $(WebCore)/Modules/webaudio/AudioGain.idl \
-       $(WebCore)/Modules/webaudio/AudioGainNode.idl \
+       $(WebCore)/Modules/webaudio/GainNode.idl \
         $(WebCore)/Modules/webaudio/AudioListener.idl \
         $(WebCore)/Modules/webaudio/AudioNode.idl \
-       $(WebCore)/Modules/webaudio/AudioPannerNode.idl \
+       $(WebCore)/Modules/webaudio/PannerNode.idl \
         $(WebCore)/Modules/webaudio/AudioParam.idl \
         $(WebCore)/Modules/webaudio/AudioProcessingEvent.idl \
         $(WebCore)/Modules/webaudio/AudioSourceNode.idl \
@@ -1282,12 +1282,12 @@ dom_binding_idls += \
         $(WebCore)/Modules/webaudio/DelayNode.idl \
         $(WebCore)/Modules/webaudio/DOMWindowWebAudio.idl \
         $(WebCore)/Modules/webaudio/DynamicsCompressorNode.idl \
-       $(WebCore)/Modules/webaudio/JavaScriptAudioNode.idl \
+       $(WebCore)/Modules/webaudio/ScriptProcessorNode.idl \
         $(WebCore)/Modules/webaudio/MediaElementAudioSourceNode.idl \
         $(WebCore)/Modules/webaudio/MediaStreamAudioSourceNode.idl \
         $(WebCore)/Modules/webaudio/OfflineAudioCompletionEvent.idl \
-    $(WebCore)/Modules/webaudio/Oscillator.idl \
-       $(WebCore)/Modules/webaudio/RealtimeAnalyserNode.idl \
+    $(WebCore)/Modules/webaudio/OscillatorNode.idl \
+       $(WebCore)/Modules/webaudio/AnalyserNode.idl \
         $(WebCore)/Modules/webaudio/WaveShaperNode.idl \
      $(WebCore)/Modules/webaudio/WaveTable.idl \
         $(WebCore)/Modules/webdatabase/DOMWindowWebDatabase.idl \
@@ -2007,17 +2007,17 @@ webcore_modules_sources += \
         Source/WebCore/Modules/webaudio/AudioBufferCallback.h \
         Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp \
         Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h \
-       Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp \
-       Source/WebCore/Modules/webaudio/AudioChannelMerger.h \
-       Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp \
-       Source/WebCore/Modules/webaudio/AudioChannelSplitter.h \
+       Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp \
+       Source/WebCore/Modules/webaudio/ChannelMergerNode.h \
+       Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp \
+       Source/WebCore/Modules/webaudio/ChannelSplitterNode.h \
         Source/WebCore/Modules/webaudio/AudioContext.cpp \
         Source/WebCore/Modules/webaudio/AudioContext.h \
         Source/WebCore/Modules/webaudio/AudioDestinationNode.cpp \
         Source/WebCore/Modules/webaudio/AudioDestinationNode.h \
         Source/WebCore/Modules/webaudio/AudioGain.h \
-       Source/WebCore/Modules/webaudio/AudioGainNode.cpp \
-       Source/WebCore/Modules/webaudio/AudioGainNode.h \
+       Source/WebCore/Modules/webaudio/GainNode.cpp \
+       Source/WebCore/Modules/webaudio/GainNode.h \
         Source/WebCore/Modules/webaudio/AudioListener.cpp \
         Source/WebCore/Modules/webaudio/AudioListener.h \
         Source/WebCore/Modules/webaudio/AudioNode.cpp \
@@ -2026,8 +2026,8 @@ webcore_modules_sources += \
         Source/WebCore/Modules/webaudio/AudioNodeInput.h \
         Source/WebCore/Modules/webaudio/AudioNodeOutput.cpp \
         Source/WebCore/Modules/webaudio/AudioNodeOutput.h \
-       Source/WebCore/Modules/webaudio/AudioPannerNode.cpp \
-       Source/WebCore/Modules/webaudio/AudioPannerNode.h \
+       Source/WebCore/Modules/webaudio/PannerNode.cpp \
+       Source/WebCore/Modules/webaudio/PannerNode.h \
         Source/WebCore/Modules/webaudio/AudioParam.cpp \
         Source/WebCore/Modules/webaudio/AudioParam.h \
         Source/WebCore/Modules/webaudio/AudioParamTimeline.cpp \
@@ -2057,8 +2057,8 @@ webcore_modules_sources += \
         Source/WebCore/Modules/webaudio/DelayProcessor.h \
         Source/WebCore/Modules/webaudio/DynamicsCompressorNode.cpp \
         Source/WebCore/Modules/webaudio/DynamicsCompressorNode.h \
-       Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp \
-       Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h \
+       Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp \
+       Source/WebCore/Modules/webaudio/ScriptProcessorNode.h \
         Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp \
         Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h \
         Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.cpp \
@@ -2067,12 +2067,12 @@ webcore_modules_sources += \
         Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp \
         Source/WebCore/Modules/webaudio/OfflineAudioCompletionEvent.h \
         Source/WebCore/Modules/webaudio/OfflineAudioCompletionEvent.cpp \
-       Source/WebCore/Modules/webaudio/Oscillator.h \
-       Source/WebCore/Modules/webaudio/Oscillator.cpp \
+       Source/WebCore/Modules/webaudio/OscillatorNode.h \
+       Source/WebCore/Modules/webaudio/OscillatorNode.cpp \
         Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp \
         Source/WebCore/Modules/webaudio/RealtimeAnalyser.h \
-       Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp \
-       Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h \
+       Source/WebCore/Modules/webaudio/AnalyserNode.cpp \
+       Source/WebCore/Modules/webaudio/AnalyserNode.h \
         Source/WebCore/Modules/webaudio/WaveShaperNode.cpp \
         Source/WebCore/Modules/webaudio/WaveShaperProcessor.h \
         Source/WebCore/Modules/webaudio/WaveShaperDSPKernel.cpp \
@@ -2346,7 +2346,7 @@ webcore_sources += \
         Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp \
         Source/WebCore/bindings/js/JSInjectedScriptManager.cpp \
         Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp \
-       Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp \
+       Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp \
         Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp \
         Source/WebCore/bindings/js/JSLazyEventListener.cpp \
         Source/WebCore/bindings/js/JSLazyEventListener.h \
diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp b/Source/WebCore/Modules/webaudio/AnalyserNode.cpp

similarity index 85%

rename from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp

rename to Source/WebCore/Modules/webaudio/AnalyserNode.cpp

index ee749604352a7dbfd89dde1bc2c6a6262764e37a..447ff019a0038f1c0e8e0c03e837f759ec99711b 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp
+++ b/Source/WebCore/Modules/webaudio/AnalyserNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "RealtimeAnalyserNode.h"
+#include "AnalyserNode.h"
  
  #include "AudioNodeInput.h"
  #include "AudioNodeOutput.h"
@@ -34,7 +34,7 @@
  
  namespace WebCore {
  
-RealtimeAnalyserNode::RealtimeAnalyserNode(AudioContext* context, float sampleRate)
+AnalyserNode::AnalyserNode(AudioContext* context, float sampleRate)
      : AudioBasicInspectorNode(context, sampleRate)
  {
      addInput(adoptPtr(new AudioNodeInput(this)));
@@ -45,12 +45,12 @@ RealtimeAnalyserNode::RealtimeAnalyserNode(AudioContext* context, float sampleRa
      initialize();
  }
  
-RealtimeAnalyserNode::~RealtimeAnalyserNode()
+AnalyserNode::~AnalyserNode()
  {
      uninitialize();
  }
  
-void RealtimeAnalyserNode::process(size_t framesToProcess)
+void AnalyserNode::process(size_t framesToProcess)
  {
      AudioBus* outputBus = output(0)->bus();
  
@@ -65,17 +65,17 @@ void RealtimeAnalyserNode::process(size_t framesToProcess)
      m_analyser.writeInput(inputBus, framesToProcess);
  
      // For in-place processing, our override of pullInputs() will just pass the audio data through unchanged if the channel count matches from input to output
-    // (resulting in inputBus == outputBus).  Otherwise, do an up-mix to stereo.
+    // (resulting in inputBus == outputBus). Otherwise, do an up-mix to stereo.
      if (inputBus != outputBus)
          outputBus->copyFrom(*inputBus);
  }
  
-void RealtimeAnalyserNode::reset()
+void AnalyserNode::reset()
  {
      m_analyser.reset();
  }
  
-void RealtimeAnalyserNode::setFftSize(unsigned int size, ExceptionCode& ec)
+void AnalyserNode::setFftSize(unsigned size, ExceptionCode& ec)
  {
      if (!m_analyser.setFftSize(size))
          ec = NOT_SUPPORTED_ERR;
diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h b/Source/WebCore/Modules/webaudio/AnalyserNode.h

similarity index 82%

rename from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h

rename to Source/WebCore/Modules/webaudio/AnalyserNode.h

index 0819c03867c4c2286ad838c177c65ad52def8cc2..435583a87ce3960012589805511e3f6988c208b5 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h
+++ b/Source/WebCore/Modules/webaudio/AnalyserNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef RealtimeAnalyserNode_h
-#define RealtimeAnalyserNode_h
+#ifndef AnalyserNode_h
+#define AnalyserNode_h
  
  #include "AudioBasicInspectorNode.h"
  #include "RealtimeAnalyser.h"
@@ -31,22 +31,22 @@
  
  namespace WebCore {
  
-class RealtimeAnalyserNode : public AudioBasicInspectorNode {
+class AnalyserNode : public AudioBasicInspectorNode {
  public:
-    static PassRefPtr<RealtimeAnalyserNode> create(AudioContext* context, float sampleRate)
+    static PassRefPtr<AnalyserNode> create(AudioContext* context, float sampleRate)
      {
-        return adoptRef(new RealtimeAnalyserNode(context, sampleRate));      
+        return adoptRef(new AnalyserNode(context, sampleRate));      
      }
  
-    virtual ~RealtimeAnalyserNode();
+    virtual ~AnalyserNode();
      
      // AudioNode
      virtual void process(size_t framesToProcess);
      virtual void reset();
  
      // Javascript bindings
-    unsigned int fftSize() const { return m_analyser.fftSize(); }
-    void setFftSize(unsigned int size, ExceptionCode&);
+    unsigned fftSize() const { return m_analyser.fftSize(); }
+    void setFftSize(unsigned size, ExceptionCode&);
  
      unsigned frequencyBinCount() const { return m_analyser.frequencyBinCount(); }
  
@@ -67,11 +67,11 @@ private:
      virtual double tailTime() const OVERRIDE { return 0; }
      virtual double latencyTime() const OVERRIDE { return 0; }
  
-    RealtimeAnalyserNode(AudioContext*, float sampleRate);
+    AnalyserNode(AudioContext*, float sampleRate);
  
      RealtimeAnalyser m_analyser;
  };
  
  } // namespace WebCore
  
-#endif // RealtimeAnalyserNode_h
+#endif // AnalyserNode_h
diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl b/Source/WebCore/Modules/webaudio/AnalyserNode.idl

similarity index 97%

rename from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl

rename to Source/WebCore/Modules/webaudio/AnalyserNode.idl

index 7634783c15d8d349d54f7fdd3fa0883899db3c00..85006e1795932da8888f478902fe348543888a75 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl
+++ b/Source/WebCore/Modules/webaudio/AnalyserNode.idl
@@ -25,7 +25,7 @@
  [
      Conditional=WEB_AUDIO,
      JSGenerateToJSObject
-] interface RealtimeAnalyserNode : AudioNode {
+] interface AnalyserNode : AudioNode {
      attribute unsigned long fftSize
          setter raises(DOMException);
      readonly attribute unsigned long frequencyBinCount;
diff --git a/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp b/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp

index 4f7432572678c70b467302c90f5febfd59bdccf7..e52ace462b41fb4a96bfb4584aa11cf60be10179 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp
+++ b/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp
@@ -447,7 +447,7 @@ bool AudioBufferSourceNode::propagatesSilence() const
      return !isPlayingOrScheduled() || hasFinished() || !m_buffer;
  }
  
-void AudioBufferSourceNode::setPannerNode(AudioPannerNode* pannerNode)
+void AudioBufferSourceNode::setPannerNode(PannerNode* pannerNode)
  {
      if (m_pannerNode != pannerNode && !hasFinished()) {
          if (pannerNode)
diff --git a/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h b/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h

index 24736e1651bcc91e00da99656496592f68d99a4d..ddc38fec04ed4e893298cf8f7893fffa9887bc65 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h
+++ b/Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h
@@ -28,8 +28,8 @@
  #include "AudioBuffer.h"
  #include "AudioBus.h"
  #include "AudioGain.h"
-#include "AudioPannerNode.h"
  #include "AudioScheduledSourceNode.h"
+#include "PannerNode.h"
  #include <wtf/OwnArrayPtr.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/RefPtr.h>
@@ -82,7 +82,7 @@ public:
      AudioParam* playbackRate() { return m_playbackRate.get(); }
  
      // If a panner node is set, then we can incorporate doppler shift into the playback pitch rate.
-    void setPannerNode(AudioPannerNode*);
+    void setPannerNode(PannerNode*);
      void clearPannerNode();
  
      // If we are no longer playing, propogate silence ahead to downstream nodes.
@@ -132,7 +132,7 @@ private:
      
      // We optionally keep track of a panner node which has a doppler shift that is incorporated into
      // the pitch rate. We manually manage ref-counting because we want to use RefTypeConnection.
-    AudioPannerNode* m_pannerNode;
+    PannerNode* m_pannerNode;
  
      // This synchronizes process() with setBuffer() which can cause dynamic channel count changes.
      mutable Mutex m_processLock;
diff --git a/Source/WebCore/Modules/webaudio/AudioContext.cpp b/Source/WebCore/Modules/webaudio/AudioContext.cpp

index 1c94de52ed9cba9957315b6930bd8107da1046ae..233a3245482e8b8f9ecf59efb61301b6167c4f47 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioContext.cpp
+++ b/Source/WebCore/Modules/webaudio/AudioContext.cpp
@@ -28,18 +28,17 @@
  
  #include "AudioContext.h"
  
+#include "AnalyserNode.h"
  #include "AsyncAudioDecoder.h"
  #include "AudioBuffer.h"
  #include "AudioBufferCallback.h"
  #include "AudioBufferSourceNode.h"
-#include "AudioChannelMerger.h"
-#include "AudioChannelSplitter.h"
-#include "AudioGainNode.h"
  #include "AudioListener.h"
  #include "AudioNodeInput.h"
  #include "AudioNodeOutput.h"
-#include "AudioPannerNode.h"
  #include "BiquadFilterNode.h"
+#include "ChannelMergerNode.h"
+#include "ChannelSplitterNode.h"
  #include "ConvolverNode.h"
  #include "DefaultAudioDestinationNode.h"
  #include "DelayNode.h"
@@ -47,14 +46,15 @@
  #include "DynamicsCompressorNode.h"
  #include "ExceptionCode.h"
  #include "FFTFrame.h"
+#include "GainNode.h"
  #include "HRTFDatabaseLoader.h"
  #include "HRTFPanner.h"
-#include "JavaScriptAudioNode.h"
  #include "OfflineAudioCompletionEvent.h"
  #include "OfflineAudioDestinationNode.h"
-#include "Oscillator.h"
-#include "RealtimeAnalyserNode.h"
+#include "OscillatorNode.h"
+#include "PannerNode.h"
  #include "ScriptCallStack.h"
+#include "ScriptProcessorNode.h"
  #include "WaveShaperNode.h"
  #include "WaveTable.h"
  
@@ -420,23 +420,23 @@ PassRefPtr<MediaStreamAudioSourceNode> AudioContext::createMediaStreamSource(Med
  }
  #endif
  
-PassRefPtr<JavaScriptAudioNode> AudioContext::createJavaScriptNode(size_t bufferSize, ExceptionCode& ec)
+PassRefPtr<ScriptProcessorNode> AudioContext::createJavaScriptNode(size_t bufferSize, ExceptionCode& ec)
  {
      // Set number of input/output channels to stereo by default.
      return createJavaScriptNode(bufferSize, 2, 2, ec);
  }
  
-PassRefPtr<JavaScriptAudioNode> AudioContext::createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, ExceptionCode& ec)
+PassRefPtr<ScriptProcessorNode> AudioContext::createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, ExceptionCode& ec)
  {
      // Set number of output channels to stereo by default.
      return createJavaScriptNode(bufferSize, numberOfInputChannels, 2, ec);
  }
  
-PassRefPtr<JavaScriptAudioNode> AudioContext::createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionCode& ec)
+PassRefPtr<ScriptProcessorNode> AudioContext::createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionCode& ec)
  {
      ASSERT(isMainThread());
      lazyInitialize();
-    RefPtr<JavaScriptAudioNode> node = JavaScriptAudioNode::create(this, m_destinationNode->sampleRate(), bufferSize, numberOfInputChannels, numberOfOutputChannels);
+    RefPtr<ScriptProcessorNode> node = ScriptProcessorNode::create(this, m_destinationNode->sampleRate(), bufferSize, numberOfInputChannels, numberOfOutputChannels);
  
      if (!node.get()) {
          ec = SYNTAX_ERR;
@@ -461,11 +461,11 @@ PassRefPtr<WaveShaperNode> AudioContext::createWaveShaper()
      return WaveShaperNode::create(this);
  }
  
-PassRefPtr<AudioPannerNode> AudioContext::createPanner()
+PassRefPtr<PannerNode> AudioContext::createPanner()
  {
      ASSERT(isMainThread());
      lazyInitialize();
-    return AudioPannerNode::create(this, m_destinationNode->sampleRate());
+    return PannerNode::create(this, m_destinationNode->sampleRate());
  }
  
  PassRefPtr<ConvolverNode> AudioContext::createConvolver()
@@ -482,18 +482,18 @@ PassRefPtr<DynamicsCompressorNode> AudioContext::createDynamicsCompressor()
      return DynamicsCompressorNode::create(this, m_destinationNode->sampleRate());
  }
  
-PassRefPtr<RealtimeAnalyserNode> AudioContext::createAnalyser()
+PassRefPtr<AnalyserNode> AudioContext::createAnalyser()
  {
      ASSERT(isMainThread());
      lazyInitialize();
-    return RealtimeAnalyserNode::create(this, m_destinationNode->sampleRate());
+    return AnalyserNode::create(this, m_destinationNode->sampleRate());
  }
  
-PassRefPtr<AudioGainNode> AudioContext::createGainNode()
+PassRefPtr<GainNode> AudioContext::createGainNode()
  {
      ASSERT(isMainThread());
      lazyInitialize();
-    return AudioGainNode::create(this, m_destinationNode->sampleRate());
+    return GainNode::create(this, m_destinationNode->sampleRate());
  }
  
  PassRefPtr<DelayNode> AudioContext::createDelayNode()
@@ -509,18 +509,18 @@ PassRefPtr<DelayNode> AudioContext::createDelayNode(double maxDelayTime)
      return DelayNode::create(this, m_destinationNode->sampleRate(), maxDelayTime);
  }
  
-PassRefPtr<AudioChannelSplitter> AudioContext::createChannelSplitter(ExceptionCode& ec)
+PassRefPtr<ChannelSplitterNode> AudioContext::createChannelSplitter(ExceptionCode& ec)
  {
      const unsigned ChannelSplitterDefaultNumberOfOutputs = 6;
      return createChannelSplitter(ChannelSplitterDefaultNumberOfOutputs, ec);
  }
  
-PassRefPtr<AudioChannelSplitter> AudioContext::createChannelSplitter(size_t numberOfOutputs, ExceptionCode& ec)
+PassRefPtr<ChannelSplitterNode> AudioContext::createChannelSplitter(size_t numberOfOutputs, ExceptionCode& ec)
  {
      ASSERT(isMainThread());
      lazyInitialize();
  
-    RefPtr<AudioChannelSplitter> node = AudioChannelSplitter::create(this, m_destinationNode->sampleRate(), numberOfOutputs);
+    RefPtr<ChannelSplitterNode> node = ChannelSplitterNode::create(this, m_destinationNode->sampleRate(), numberOfOutputs);
  
      if (!node.get()) {
          ec = SYNTAX_ERR;
@@ -530,18 +530,18 @@ PassRefPtr<AudioChannelSplitter> AudioContext::createChannelSplitter(size_t numb
      return node;
  }
  
-PassRefPtr<AudioChannelMerger> AudioContext::createChannelMerger(ExceptionCode& ec)
+PassRefPtr<ChannelMergerNode> AudioContext::createChannelMerger(ExceptionCode& ec)
  {
      const unsigned ChannelMergerDefaultNumberOfInputs = 6;
      return createChannelMerger(ChannelMergerDefaultNumberOfInputs, ec);
  }
  
-PassRefPtr<AudioChannelMerger> AudioContext::createChannelMerger(size_t numberOfInputs, ExceptionCode& ec)
+PassRefPtr<ChannelMergerNode> AudioContext::createChannelMerger(size_t numberOfInputs, ExceptionCode& ec)
  {
      ASSERT(isMainThread());
      lazyInitialize();
  
-    RefPtr<AudioChannelMerger> node = AudioChannelMerger::create(this, m_destinationNode->sampleRate(), numberOfInputs);
+    RefPtr<ChannelMergerNode> node = ChannelMergerNode::create(this, m_destinationNode->sampleRate(), numberOfInputs);
  
      if (!node.get()) {
          ec = SYNTAX_ERR;
@@ -551,12 +551,12 @@ PassRefPtr<AudioChannelMerger> AudioContext::createChannelMerger(size_t numberOf
      return node;
  }
  
-PassRefPtr<Oscillator> AudioContext::createOscillator()
+PassRefPtr<OscillatorNode> AudioContext::createOscillator()
  {
      ASSERT(isMainThread());
      lazyInitialize();
  
-    RefPtr<Oscillator> node = Oscillator::create(this, m_destinationNode->sampleRate());
+    RefPtr<OscillatorNode> node = OscillatorNode::create(this, m_destinationNode->sampleRate());
  
      // Because this is an AudioScheduledSourceNode, the context keeps a reference until it has finished playing.
      // When this happens, AudioScheduledSourceNode::finish() calls AudioContext::notifyNodeFinishedProcessing().
diff --git a/Source/WebCore/Modules/webaudio/AudioContext.h b/Source/WebCore/Modules/webaudio/AudioContext.h

index fd40b84aa8ef3e3dae9c9a515c479acfe68f22a4..08167f53158c75ba3928be0b0be852610df492ee 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioContext.h
+++ b/Source/WebCore/Modules/webaudio/AudioContext.h
@@ -51,10 +51,10 @@ class AudioBufferSourceNode;
  class MediaElementAudioSourceNode;
  class MediaStreamAudioSourceNode;
  class HTMLMediaElement;
-class AudioChannelMerger;
-class AudioChannelSplitter;
-class AudioGainNode;
-class AudioPannerNode;
+class ChannelMergerNode;
+class ChannelSplitterNode;
+class GainNode;
+class PannerNode;
  class AudioListener;
  class AudioSummingJunction;
  class BiquadFilterNode;
@@ -62,10 +62,10 @@ class DelayNode;
  class Document;
  class ConvolverNode;
  class DynamicsCompressorNode;
-class RealtimeAnalyserNode;
+class AnalyserNode;
  class WaveShaperNode;
-class JavaScriptAudioNode;
-class Oscillator;
+class ScriptProcessorNode;
+class OscillatorNode;
  class WaveTable;
  
  // AudioContext is the cornerstone of the web audio API and all AudioNodes are created from it.
@@ -119,23 +119,23 @@ public:
  #if ENABLE(MEDIA_STREAM)
      PassRefPtr<MediaStreamAudioSourceNode> createMediaStreamSource(MediaStream*, ExceptionCode&);
  #endif
-    PassRefPtr<AudioGainNode> createGainNode();
+    PassRefPtr<GainNode> createGainNode();
      PassRefPtr<BiquadFilterNode> createBiquadFilter();
      PassRefPtr<WaveShaperNode> createWaveShaper();
      PassRefPtr<DelayNode> createDelayNode();
      PassRefPtr<DelayNode> createDelayNode(double maxDelayTime);
-    PassRefPtr<AudioPannerNode> createPanner();
+    PassRefPtr<PannerNode> createPanner();
      PassRefPtr<ConvolverNode> createConvolver();
      PassRefPtr<DynamicsCompressorNode> createDynamicsCompressor();    
-    PassRefPtr<RealtimeAnalyserNode> createAnalyser();
-    PassRefPtr<JavaScriptAudioNode> createJavaScriptNode(size_t bufferSize, ExceptionCode&);
-    PassRefPtr<JavaScriptAudioNode> createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, ExceptionCode&);
-    PassRefPtr<JavaScriptAudioNode> createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionCode&);
-    PassRefPtr<AudioChannelSplitter> createChannelSplitter(ExceptionCode&);
-    PassRefPtr<AudioChannelSplitter> createChannelSplitter(size_t numberOfOutputs, ExceptionCode&);
-    PassRefPtr<AudioChannelMerger> createChannelMerger(ExceptionCode&);
-    PassRefPtr<AudioChannelMerger> createChannelMerger(size_t numberOfInputs, ExceptionCode&);
-    PassRefPtr<Oscillator> createOscillator();
+    PassRefPtr<AnalyserNode> createAnalyser();
+    PassRefPtr<ScriptProcessorNode> createJavaScriptNode(size_t bufferSize, ExceptionCode&);
+    PassRefPtr<ScriptProcessorNode> createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, ExceptionCode&);
+    PassRefPtr<ScriptProcessorNode> createJavaScriptNode(size_t bufferSize, size_t numberOfInputChannels, size_t numberOfOutputChannels, ExceptionCode&);
+    PassRefPtr<ChannelSplitterNode> createChannelSplitter(ExceptionCode&);
+    PassRefPtr<ChannelSplitterNode> createChannelSplitter(size_t numberOfOutputs, ExceptionCode&);
+    PassRefPtr<ChannelMergerNode> createChannelMerger(ExceptionCode&);
+    PassRefPtr<ChannelMergerNode> createChannelMerger(size_t numberOfInputs, ExceptionCode&);
+    PassRefPtr<OscillatorNode> createOscillator();
      PassRefPtr<WaveTable> createWaveTable(Float32Array* real, Float32Array* imag, ExceptionCode&);
  
      // When a source node has no more processing to do (has finished playing), then it tells the context to dereference it.
diff --git a/Source/WebCore/Modules/webaudio/AudioContext.idl b/Source/WebCore/Modules/webaudio/AudioContext.idl

index e7f972e60c062fa9a2d6b0f261d519802ae0c217..8ee2dc29d0a94b1d9f52f5379d76641d8988d584 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioContext.idl
+++ b/Source/WebCore/Modules/webaudio/AudioContext.idl
@@ -69,24 +69,24 @@
  #endif
  
      // Processing nodes
-    AudioGainNode createGainNode();
+    GainNode createGainNode();
      DelayNode createDelayNode(in [Optional] double maxDelayTime);
      BiquadFilterNode createBiquadFilter();
      WaveShaperNode createWaveShaper();
-    AudioPannerNode createPanner();
+    PannerNode createPanner();
      ConvolverNode createConvolver();
      DynamicsCompressorNode createDynamicsCompressor();
-    RealtimeAnalyserNode createAnalyser();
-    JavaScriptAudioNode createJavaScriptNode(in unsigned long bufferSize, in [Optional] unsigned long numberOfInputChannels, in [Optional] unsigned long numberOfOutputChannels)
+    AnalyserNode createAnalyser();
+    ScriptProcessorNode createJavaScriptNode(in unsigned long bufferSize, in [Optional] unsigned long numberOfInputChannels, in [Optional] unsigned long numberOfOutputChannels)
          raises(DOMException);
-    Oscillator createOscillator();
+    OscillatorNode createOscillator();
      WaveTable createWaveTable(in Float32Array real, in Float32Array imag)
          raises(DOMException);
  
      // Channel splitting and merging
-    AudioChannelSplitter createChannelSplitter(in [Optional] unsigned long numberOfOutputs)
+    ChannelSplitterNode createChannelSplitter(in [Optional] unsigned long numberOfOutputs)
          raises(DOMException);
-    AudioChannelMerger createChannelMerger(in [Optional] unsigned long numberOfInputs)
+    ChannelMergerNode createChannelMerger(in [Optional] unsigned long numberOfInputs)
          raises(DOMException);
  
      // Offline rendering
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp b/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp

similarity index 88%

rename from Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp

rename to Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp

index f9dfccef4b6d95cf6c5deb9c90c69d3a5644ec72..09face7c166dcc43b415fb50d420fb152ee63ff1 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp
+++ b/Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp
@@ -30,7 +30,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "AudioChannelMerger.h"
+#include "ChannelMergerNode.h"
  
  #include "AudioContext.h"
  #include "AudioNodeInput.h"
@@ -38,15 +38,15 @@
  
  namespace WebCore {
  
-PassRefPtr<AudioChannelMerger> AudioChannelMerger::create(AudioContext* context, float sampleRate, unsigned numberOfInputs)
+PassRefPtr<ChannelMergerNode> ChannelMergerNode::create(AudioContext* context, float sampleRate, unsigned numberOfInputs)
  {
      if (!numberOfInputs || numberOfInputs > AudioContext::maxNumberOfChannels())
          return 0;
      
-    return adoptRef(new AudioChannelMerger(context, sampleRate, numberOfInputs));      
+    return adoptRef(new ChannelMergerNode(context, sampleRate, numberOfInputs));      
  }
  
-AudioChannelMerger::AudioChannelMerger(AudioContext* context, float sampleRate, unsigned numberOfInputs)
+ChannelMergerNode::ChannelMergerNode(AudioContext* context, float sampleRate, unsigned numberOfInputs)
      : AudioNode(context, sampleRate)
  {
      // Create the requested number of inputs.
@@ -60,7 +60,7 @@ AudioChannelMerger::AudioChannelMerger(AudioContext* context, float sampleRate,
      initialize();
  }
  
-void AudioChannelMerger::process(size_t framesToProcess)
+void ChannelMergerNode::process(size_t framesToProcess)
  {
      AudioNodeOutput* output = this->output(0);
      ASSERT(output);
@@ -87,13 +87,13 @@ void AudioChannelMerger::process(size_t framesToProcess)
      ASSERT(outputChannelIndex == output->numberOfChannels());
  }
  
-void AudioChannelMerger::reset()
+void ChannelMergerNode::reset()
  {
  }
  
  // Any time a connection or disconnection happens on any of our inputs, we potentially need to change the
  // number of channels of our output.
-void AudioChannelMerger::checkNumberOfChannelsForInput(AudioNodeInput* input)
+void ChannelMergerNode::checkNumberOfChannelsForInput(AudioNodeInput* input)
  {
      ASSERT(context()->isAudioThread() && context()->isGraphOwner());
  
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelMerger.h b/Source/WebCore/Modules/webaudio/ChannelMergerNode.h

similarity index 86%

rename from Source/WebCore/Modules/webaudio/AudioChannelMerger.h

rename to Source/WebCore/Modules/webaudio/ChannelMergerNode.h

index 4a1d575228bf14fd5eb4cc3960ca89c1779e7f90..19765d5849983f54a8c281e827b37b3f40183bba 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelMerger.h
+++ b/Source/WebCore/Modules/webaudio/ChannelMergerNode.h
@@ -26,8 +26,8 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef AudioChannelMerger_h
-#define AudioChannelMerger_h
+#ifndef ChannelMergerNode_h
+#define ChannelMergerNode_h
  
  #include "AudioNode.h"
  #include <wtf/PassRefPtr.h>
@@ -36,9 +36,9 @@ namespace WebCore {
  
  class AudioContext;
      
-class AudioChannelMerger : public AudioNode {
+class ChannelMergerNode : public AudioNode {
  public:
-    static PassRefPtr<AudioChannelMerger> create(AudioContext*, float sampleRate, unsigned numberOfInputs);
+    static PassRefPtr<ChannelMergerNode> create(AudioContext*, float sampleRate, unsigned numberOfInputs);
  
      // AudioNode
      virtual void process(size_t framesToProcess);
@@ -51,9 +51,9 @@ private:
      virtual double tailTime() const OVERRIDE { return 0; }
      virtual double latencyTime() const OVERRIDE { return 0; }
  
-    AudioChannelMerger(AudioContext*, float sampleRate, unsigned numberOfInputs);
+    ChannelMergerNode(AudioContext*, float sampleRate, unsigned numberOfInputs);
  };
  
  } // namespace WebCore
  
-#endif // AudioChannelMerger_h
+#endif // ChannelMergerNode_h
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelMerger.idl b/Source/WebCore/Modules/webaudio/ChannelMergerNode.idl

similarity index 97%

rename from Source/WebCore/Modules/webaudio/AudioChannelMerger.idl

rename to Source/WebCore/Modules/webaudio/ChannelMergerNode.idl

index 1035d26ac8502381afe43604c4ad291fe0ef0bac..e79ce5a2d59e58b372330cc059350c01eeed6514 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelMerger.idl
+++ b/Source/WebCore/Modules/webaudio/ChannelMergerNode.idl
@@ -28,5 +28,5 @@
  
  [
      Conditional=WEB_AUDIO
-] interface AudioChannelMerger : AudioNode {
+] interface ChannelMergerNode : AudioNode {
  };
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp

similarity index 86%

rename from Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp

rename to Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp

index f783615fc616d1f66d269b049395ccc33f879119..cc50526d7b7e7bf1040611328605550e4d3d6e2c 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp
+++ b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "AudioChannelSplitter.h"
+#include "ChannelSplitterNode.h"
  
  #include "AudioContext.h"
  #include "AudioNodeInput.h"
@@ -34,15 +34,15 @@
  
  namespace WebCore {
      
-PassRefPtr<AudioChannelSplitter> AudioChannelSplitter::create(AudioContext* context, float sampleRate, unsigned numberOfOutputs)
+PassRefPtr<ChannelSplitterNode> ChannelSplitterNode::create(AudioContext* context, float sampleRate, unsigned numberOfOutputs)
  {
      if (!numberOfOutputs || numberOfOutputs > AudioContext::maxNumberOfChannels())
          return 0;
  
-    return adoptRef(new AudioChannelSplitter(context, sampleRate, numberOfOutputs));      
+    return adoptRef(new ChannelSplitterNode(context, sampleRate, numberOfOutputs));      
  }
  
-AudioChannelSplitter::AudioChannelSplitter(AudioContext* context, float sampleRate, unsigned numberOfOutputs)
+ChannelSplitterNode::ChannelSplitterNode(AudioContext* context, float sampleRate, unsigned numberOfOutputs)
      : AudioNode(context, sampleRate)
  {
      addInput(adoptPtr(new AudioNodeInput(this)));
@@ -56,7 +56,7 @@ AudioChannelSplitter::AudioChannelSplitter(AudioContext* context, float sampleRa
      initialize();
  }
  
-void AudioChannelSplitter::process(size_t framesToProcess)
+void ChannelSplitterNode::process(size_t framesToProcess)
  {
      AudioBus* source = input(0)->bus();
      ASSERT(source);
@@ -79,7 +79,7 @@ void AudioChannelSplitter::process(size_t framesToProcess)
      }
  }
  
-void AudioChannelSplitter::reset()
+void ChannelSplitterNode::reset()
  {
  }
  
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.h b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.h

similarity index 83%

rename from Source/WebCore/Modules/webaudio/AudioChannelSplitter.h

rename to Source/WebCore/Modules/webaudio/ChannelSplitterNode.h

index f5578ac01c6ce78ed2fecb70778a95e2eaa6c7b5..1d71907d60aaf02a925e46aac9e16976be415cd2 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.h
+++ b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef AudioChannelSplitter_h
-#define AudioChannelSplitter_h
+#ifndef ChannelSplitterNode_h
+#define ChannelSplitterNode_h
  
  #include "AudioNode.h"
  #include <wtf/PassRefPtr.h>
@@ -32,9 +32,9 @@ namespace WebCore {
  
  class AudioContext;
      
-class AudioChannelSplitter : public AudioNode {
+class ChannelSplitterNode : public AudioNode {
  public:
-    static PassRefPtr<AudioChannelSplitter> create(AudioContext*, float sampleRate, unsigned numberOfOutputs);
+    static PassRefPtr<ChannelSplitterNode> create(AudioContext*, float sampleRate, unsigned numberOfOutputs);
  
      // AudioNode
      virtual void process(size_t framesToProcess);
@@ -44,9 +44,9 @@ private:
      virtual double tailTime() const OVERRIDE { return 0; }
      virtual double latencyTime() const OVERRIDE { return 0; }
  
-    AudioChannelSplitter(AudioContext*, float sampleRate, unsigned numberOfOutputs);
+    ChannelSplitterNode(AudioContext*, float sampleRate, unsigned numberOfOutputs);
  };
  
  } // namespace WebCore
  
-#endif // AudioChannelSplitter_h
+#endif // ChannelSplitterNode_h
diff --git a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.idl b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl

similarity index 96%

rename from Source/WebCore/Modules/webaudio/AudioChannelSplitter.idl

rename to Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl

index 87376f97a6d4cd9d60c01821db5b23748e68e94b..eabfba1ef96d813e9af5905da594e1da8be90bfd 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioChannelSplitter.idl
+++ b/Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl
@@ -24,5 +24,5 @@
  
  [
      Conditional=WEB_AUDIO
-] interface AudioChannelSplitter : AudioNode {
+] interface ChannelSplitterNode : AudioNode {
  };
diff --git a/Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl b/Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl

index 2737ecfdde0376af2a57777e7e662da89d9a4e46..df88fb0f6170e3f281970e1b4cf20048a7bd6510 100644 (file)
--- a/Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl
+++ b/Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl
@@ -30,7 +30,7 @@
  ] interface DOMWindowWebAudio {
  #if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
      [JSCustomGetter, V8EnabledAtRuntime] attribute AudioContextConstructor webkitAudioContext;
-    attribute AudioPannerNodeConstructor webkitAudioPannerNode;
+    attribute PannerNodeConstructor webkitAudioPannerNode;
      attribute AudioProcessingEventConstructor AudioProcessingEvent;
      attribute OfflineAudioCompletionEventConstructor OfflineAudioCompletionEvent;
  #endif
diff --git a/Source/WebCore/Modules/webaudio/AudioGainNode.cpp b/Source/WebCore/Modules/webaudio/GainNode.cpp

similarity index 94%

rename from Source/WebCore/Modules/webaudio/AudioGainNode.cpp

rename to Source/WebCore/Modules/webaudio/GainNode.cpp

index 4f513c000de5f2d7c327ab871f0581190e6716c8..60087729bc7c1559f01c93acc858916ee0ae2b1a 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioGainNode.cpp
+++ b/Source/WebCore/Modules/webaudio/GainNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "AudioGainNode.h"
+#include "GainNode.h"
  
  #include "AudioBus.h"
  #include "AudioNodeInput.h"
@@ -34,7 +34,7 @@
  
  namespace WebCore {
  
-AudioGainNode::AudioGainNode(AudioContext* context, float sampleRate)
+GainNode::GainNode(AudioContext* context, float sampleRate)
      : AudioNode(context, sampleRate)
      , m_lastGain(1.0)
      , m_sampleAccurateGainValues(AudioNode::ProcessingSizeInFrames) // FIXME: can probably share temp buffer in context
@@ -49,7 +49,7 @@ AudioGainNode::AudioGainNode(AudioContext* context, float sampleRate)
      initialize();
  }
  
-void AudioGainNode::process(size_t framesToProcess)
+void GainNode::process(size_t framesToProcess)
  {
      // FIXME: for some cases there is a nice optimization to avoid processing here, and let the gain change
      // happen in the summing junction input of the AudioNode we're connected to.
@@ -78,7 +78,7 @@ void AudioGainNode::process(size_t framesToProcess)
      }
  }
  
-void AudioGainNode::reset()
+void GainNode::reset()
  {
      // Snap directly to desired gain.
      m_lastGain = gain()->value();
@@ -89,7 +89,7 @@ void AudioGainNode::reset()
  // As soon as we know the channel count of our input, we can lazily initialize.
  // Sometimes this may be called more than once with different channel counts, in which case we must safely
  // uninitialize and then re-initialize with the new channel count.
-void AudioGainNode::checkNumberOfChannelsForInput(AudioNodeInput* input)
+void GainNode::checkNumberOfChannelsForInput(AudioNodeInput* input)
  {
      ASSERT(context()->isAudioThread() && context()->isGraphOwner());
  
diff --git a/Source/WebCore/Modules/webaudio/AudioGainNode.h b/Source/WebCore/Modules/webaudio/GainNode.h

similarity index 83%

rename from Source/WebCore/Modules/webaudio/AudioGainNode.h

rename to Source/WebCore/Modules/webaudio/GainNode.h

index 69a64b471e3695830fdb5047aee49b23296deed7..4b41ad21daf1c300d6181290cc17bc8b66bb752f 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioGainNode.h
+++ b/Source/WebCore/Modules/webaudio/GainNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef AudioGainNode_h
-#define AudioGainNode_h
+#ifndef GainNode_h
+#define GainNode_h
  
  #include "AudioGain.h"
  #include "AudioNode.h"
@@ -34,14 +34,14 @@ namespace WebCore {
  
  class AudioContext;
      
-// AudioGainNode is an AudioNode with one input and one output which applies a gain (volume) change to the audio signal.
+// GainNode is an AudioNode with one input and one output which applies a gain (volume) change to the audio signal.
  // De-zippering (smoothing) is applied when the gain value is changed dynamically.
  
-class AudioGainNode : public AudioNode {
+class GainNode : public AudioNode {
  public:
-    static PassRefPtr<AudioGainNode> create(AudioContext* context, float sampleRate)
+    static PassRefPtr<GainNode> create(AudioContext* context, float sampleRate)
      {
-        return adoptRef(new AudioGainNode(context, sampleRate));      
+        return adoptRef(new GainNode(context, sampleRate));      
      }
      
      // AudioNode
@@ -58,7 +58,7 @@ private:
      virtual double tailTime() const OVERRIDE { return 0; }
      virtual double latencyTime() const OVERRIDE { return 0; }
  
-    AudioGainNode(AudioContext*, float sampleRate);
+    GainNode(AudioContext*, float sampleRate);
  
      float m_lastGain; // for de-zippering
      RefPtr<AudioGain> m_gain;
@@ -68,4 +68,4 @@ private:
  
  } // namespace WebCore
  
-#endif // AudioGainNode_h
+#endif // GainNode_h
diff --git a/Source/WebCore/Modules/webaudio/AudioGainNode.idl b/Source/WebCore/Modules/webaudio/GainNode.idl

similarity index 97%

rename from Source/WebCore/Modules/webaudio/AudioGainNode.idl

rename to Source/WebCore/Modules/webaudio/GainNode.idl

index 375936e79f55932690d5c6f8da392756d9407a2d..523d89e04cca740020335b0df6589e3d61047811 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioGainNode.idl
+++ b/Source/WebCore/Modules/webaudio/GainNode.idl
@@ -25,7 +25,7 @@
  [
      Conditional=WEB_AUDIO,
      JSGenerateToJSObject
-] interface AudioGainNode : AudioNode {
+] interface GainNode : AudioNode {
      // FIXME: eventually it will be interesting to remove the readonly restriction, but need to properly deal with thread safety here.
      readonly attribute AudioGain gain;
  };
diff --git a/Source/WebCore/Modules/webaudio/Oscillator.cpp b/Source/WebCore/Modules/webaudio/OscillatorNode.cpp

similarity index 91%

rename from Source/WebCore/Modules/webaudio/Oscillator.cpp

rename to Source/WebCore/Modules/webaudio/OscillatorNode.cpp

index bad1bd7146b639f419a0f9c85b478c6b828c035b..68df9a3bfb234993aba0da5f87463740c78a48d3 100644 (file)
--- a/Source/WebCore/Modules/webaudio/Oscillator.cpp
+++ b/Source/WebCore/Modules/webaudio/OscillatorNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "Oscillator.h"
+#include "OscillatorNode.h"
  
  #include "AudioContext.h"
  #include "AudioNodeOutput.h"
@@ -43,17 +43,17 @@ namespace WebCore {
  
  using namespace VectorMath;
  
-WaveTable* Oscillator::s_waveTableSine = 0;
-WaveTable* Oscillator::s_waveTableSquare = 0;
-WaveTable* Oscillator::s_waveTableSawtooth = 0;
-WaveTable* Oscillator::s_waveTableTriangle = 0;
+WaveTable* OscillatorNode::s_waveTableSine = 0;
+WaveTable* OscillatorNode::s_waveTableSquare = 0;
+WaveTable* OscillatorNode::s_waveTableSawtooth = 0;
+WaveTable* OscillatorNode::s_waveTableTriangle = 0;
  
-PassRefPtr<Oscillator> Oscillator::create(AudioContext* context, float sampleRate)
+PassRefPtr<OscillatorNode> OscillatorNode::create(AudioContext* context, float sampleRate)
  {
-    return adoptRef(new Oscillator(context, sampleRate));
+    return adoptRef(new OscillatorNode(context, sampleRate));
  }
  
-Oscillator::Oscillator(AudioContext* context, float sampleRate)
+OscillatorNode::OscillatorNode(AudioContext* context, float sampleRate)
      : AudioScheduledSourceNode(context, sampleRate)
      , m_type(SINE)
      , m_firstRender(true)
@@ -78,12 +78,12 @@ Oscillator::Oscillator(AudioContext* context, float sampleRate)
      initialize();
  }
  
-Oscillator::~Oscillator()
+OscillatorNode::~OscillatorNode()
  {
      uninitialize();
  }
  
-void Oscillator::setType(unsigned short type, ExceptionCode& ec)
+void OscillatorNode::setType(unsigned short type, ExceptionCode& ec)
  {
      WaveTable* waveTable = 0;
      float sampleRate = this->sampleRate();
@@ -121,7 +121,7 @@ void Oscillator::setType(unsigned short type, ExceptionCode& ec)
      m_type = type;
  }
  
-bool Oscillator::calculateSampleAccuratePhaseIncrements(size_t framesToProcess)
+bool OscillatorNode::calculateSampleAccuratePhaseIncrements(size_t framesToProcess)
  {
      bool isGood = framesToProcess <= m_phaseIncrements.size() && framesToProcess <= m_detuneValues.size();
      ASSERT(isGood);
@@ -187,7 +187,7 @@ bool Oscillator::calculateSampleAccuratePhaseIncrements(size_t framesToProcess)
      return hasSampleAccurateValues;
  }
  
-void Oscillator::process(size_t framesToProcess)
+void OscillatorNode::process(size_t framesToProcess)
  {
      AudioBus* outputBus = output(0)->bus();
  
@@ -217,10 +217,7 @@ void Oscillator::process(size_t framesToProcess)
      size_t quantumFrameOffset;
      size_t nonSilentFramesToProcess;
  
-    updateSchedulingInfo(framesToProcess,
-                         outputBus,
-                         quantumFrameOffset,
-                         nonSilentFramesToProcess);
+    updateSchedulingInfo(framesToProcess, outputBus, quantumFrameOffset, nonSilentFramesToProcess);
  
      if (!nonSilentFramesToProcess) {
          outputBus->zero();
@@ -303,12 +300,12 @@ void Oscillator::process(size_t framesToProcess)
      outputBus->clearSilentFlag();
  }
  
-void Oscillator::reset()
+void OscillatorNode::reset()
  {
      m_virtualReadIndex = 0;
  }
  
-void Oscillator::setWaveTable(WaveTable* waveTable)
+void OscillatorNode::setWaveTable(WaveTable* waveTable)
  {
      ASSERT(isMainThread());
  
@@ -318,7 +315,7 @@ void Oscillator::setWaveTable(WaveTable* waveTable)
      m_type = CUSTOM;
  }
  
-bool Oscillator::propagatesSilence() const
+bool OscillatorNode::propagatesSilence() const
  {
      return !isPlayingOrScheduled() || hasFinished() || !m_waveTable.get();
  }
diff --git a/Source/WebCore/Modules/webaudio/Oscillator.h b/Source/WebCore/Modules/webaudio/OscillatorNode.h

similarity index 90%

rename from Source/WebCore/Modules/webaudio/Oscillator.h

rename to Source/WebCore/Modules/webaudio/OscillatorNode.h

index 3dacab9515c1166bc2caf4d263a8abf07ada95b8..1d6b1523608e1dc0b8bf5108cd998950fb17704d 100644 (file)
--- a/Source/WebCore/Modules/webaudio/Oscillator.h
+++ b/Source/WebCore/Modules/webaudio/OscillatorNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef Oscillator_h
-#define Oscillator_h
+#ifndef OscillatorNode_h
+#define OscillatorNode_h
  
  #include "AudioBus.h"
  #include "AudioParam.h"
@@ -38,9 +38,9 @@ namespace WebCore {
  class AudioContext;
  class WaveTable;
  
-// Oscillator is an audio generator of periodic waveforms.
+// OscillatorNode is an audio generator of periodic waveforms.
  
-class Oscillator : public AudioScheduledSourceNode {
+class OscillatorNode : public AudioScheduledSourceNode {
  public:
      // The waveform type.
      // These must be defined as in the .idl file.
@@ -52,9 +52,9 @@ public:
          CUSTOM = 4
      };
  
-    static PassRefPtr<Oscillator> create(AudioContext*, float sampleRate);
+    static PassRefPtr<OscillatorNode> create(AudioContext*, float sampleRate);
  
-    virtual ~Oscillator();
+    virtual ~OscillatorNode();
      
      // AudioNode
      virtual void process(size_t framesToProcess);
@@ -69,7 +69,7 @@ public:
      void setWaveTable(WaveTable*);
  
  private:
-    Oscillator(AudioContext*, float sampleRate);
+    OscillatorNode(AudioContext*, float sampleRate);
  
      // Returns true if there are sample-accurate timeline parameter changes.
      bool calculateSampleAccuratePhaseIncrements(size_t framesToProcess);
@@ -109,4 +109,4 @@ private:
  
  } // namespace WebCore
  
-#endif // Oscillator_h
+#endif // OscillatorNode_h
diff --git a/Source/WebCore/Modules/webaudio/Oscillator.idl b/Source/WebCore/Modules/webaudio/OscillatorNode.idl

similarity index 95%

rename from Source/WebCore/Modules/webaudio/Oscillator.idl

rename to Source/WebCore/Modules/webaudio/OscillatorNode.idl

index 5490585f2743b4022f2cb083fa2845bd142bf399..34ec376e2d3294d8280955d57c75525c5605af73 100644 (file)
--- a/Source/WebCore/Modules/webaudio/Oscillator.idl
+++ b/Source/WebCore/Modules/webaudio/OscillatorNode.idl
@@ -22,11 +22,11 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-// Oscillator is an audio generator of periodic waveforms.
+// OscillatorNode is an audio generator of periodic waveforms.
  [
      Conditional=WEB_AUDIO,
      JSGenerateToJSObject
-] interface Oscillator : AudioSourceNode {
+] interface OscillatorNode : AudioSourceNode {
  
      // Type constants.
      const unsigned short SINE = 0;
diff --git a/Source/WebCore/Modules/webaudio/AudioPannerNode.cpp b/Source/WebCore/Modules/webaudio/PannerNode.cpp

similarity index 91%

rename from Source/WebCore/Modules/webaudio/AudioPannerNode.cpp

rename to Source/WebCore/Modules/webaudio/PannerNode.cpp

index d851a2513732f51354fb8c8fd1fce739b7458631..96d4d81817ba9ed53fc14e3e2c2b10cb2ffd7118 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioPannerNode.cpp
+++ b/Source/WebCore/Modules/webaudio/PannerNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "AudioPannerNode.h"
+#include "PannerNode.h"
  
  #include "AudioBufferSourceNode.h"
  #include "AudioBus.h"
@@ -47,7 +47,7 @@ static void fixNANs(double &x)
          x = 0.0;
  }
  
-AudioPannerNode::AudioPannerNode(AudioContext* context, float sampleRate)
+PannerNode::PannerNode(AudioContext* context, float sampleRate)
      : AudioNode(context, sampleRate)
      , m_panningModel(Panner::PanningModelHRTF)
      , m_lastGain(-1.0)
@@ -68,12 +68,12 @@ AudioPannerNode::AudioPannerNode(AudioContext* context, float sampleRate)
      initialize();
  }
  
-AudioPannerNode::~AudioPannerNode()
+PannerNode::~PannerNode()
  {
      uninitialize();
  }
  
-void AudioPannerNode::pullInputs(size_t framesToProcess)
+void PannerNode::pullInputs(size_t framesToProcess)
  {
      // We override pullInputs(), so we can detect new AudioSourceNodes which have connected to us when new connections are made.
      // These AudioSourceNodes need to be made aware of our existence in order to handle doppler shift pitch changes.
@@ -87,7 +87,7 @@ void AudioPannerNode::pullInputs(size_t framesToProcess)
      AudioNode::pullInputs(framesToProcess);
  }
  
-void AudioPannerNode::process(size_t framesToProcess)
+void PannerNode::process(size_t framesToProcess)
  {
      AudioBus* destination = output(0)->bus();
  
@@ -120,14 +120,14 @@ void AudioPannerNode::process(size_t framesToProcess)
      destination->copyWithGainFrom(*destination, &m_lastGain, totalGain);
  }
  
-void AudioPannerNode::reset()
+void PannerNode::reset()
  {
      m_lastGain = -1.0; // force to snap to initial gain
      if (m_panner.get())
          m_panner->reset();
  }
  
-void AudioPannerNode::initialize()
+void PannerNode::initialize()
  {
      if (isInitialized())
          return;
@@ -137,7 +137,7 @@ void AudioPannerNode::initialize()
      AudioNode::initialize();
  }
  
-void AudioPannerNode::uninitialize()
+void PannerNode::uninitialize()
  {
      if (!isInitialized())
          return;
@@ -146,12 +146,12 @@ void AudioPannerNode::uninitialize()
      AudioNode::uninitialize();
  }
  
-AudioListener* AudioPannerNode::listener()
+AudioListener* PannerNode::listener()
  {
      return context()->listener();
  }
  
-void AudioPannerNode::setPanningModel(unsigned short model, ExceptionCode& ec)
+void PannerNode::setPanningModel(unsigned short model, ExceptionCode& ec)
  {
      switch (model) {
      case EQUALPOWER:
@@ -171,7 +171,7 @@ void AudioPannerNode::setPanningModel(unsigned short model, ExceptionCode& ec)
      }
  }
  
-void AudioPannerNode::setDistanceModel(unsigned short model, ExceptionCode& ec)
+void PannerNode::setDistanceModel(unsigned short model, ExceptionCode& ec)
  {
      switch (model) {
      case DistanceEffect::ModelLinear:
@@ -185,7 +185,7 @@ void AudioPannerNode::setDistanceModel(unsigned short model, ExceptionCode& ec)
      }
  }
  
-void AudioPannerNode::getAzimuthElevation(double* outAzimuth, double* outElevation)
+void PannerNode::getAzimuthElevation(double* outAzimuth, double* outElevation)
  {
      // FIXME: we should cache azimuth and elevation (if possible), so we only re-calculate if a change has been made.
  
@@ -249,7 +249,7 @@ void AudioPannerNode::getAzimuthElevation(double* outAzimuth, double* outElevati
          *outElevation = elevation;
  }
  
-float AudioPannerNode::dopplerRate()
+float PannerNode::dopplerRate()
  {
      double dopplerShift = 1.0;
  
@@ -297,7 +297,7 @@ float AudioPannerNode::dopplerRate()
      return static_cast<float>(dopplerShift);
  }
  
-float AudioPannerNode::distanceConeGain()
+float PannerNode::distanceConeGain()
  {
      FloatPoint3D listenerPosition = listener()->position();
  
@@ -314,13 +314,13 @@ float AudioPannerNode::distanceConeGain()
      return float(distanceGain * coneGain);
  }
  
-void AudioPannerNode::notifyAudioSourcesConnectedToNode(AudioNode* node)
+void PannerNode::notifyAudioSourcesConnectedToNode(AudioNode* node)
  {
      ASSERT(node);
      if (!node)
          return;
          
-    // First check if this node is an AudioBufferSourceNode.  If so, let it know about us so that doppler shift pitch can be taken into account.
+    // First check if this node is an AudioBufferSourceNode. If so, let it know about us so that doppler shift pitch can be taken into account.
      if (node->nodeType() == NodeTypeAudioBufferSource) {
          AudioBufferSourceNode* bufferSourceNode = reinterpret_cast<AudioBufferSourceNode*>(node);
          bufferSourceNode->setPannerNode(this);
diff --git a/Source/WebCore/Modules/webaudio/AudioPannerNode.h b/Source/WebCore/Modules/webaudio/PannerNode.h

similarity index 93%

rename from Source/WebCore/Modules/webaudio/AudioPannerNode.h

rename to Source/WebCore/Modules/webaudio/PannerNode.h

index 0bb861361181e98b4f6709f3e752b6e62c32da51..b8cc1de7d863923d5994dbf85b170919be099daa 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioPannerNode.h
+++ b/Source/WebCore/Modules/webaudio/PannerNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef AudioPannerNode_h
-#define AudioPannerNode_h
+#ifndef PannerNode_h
+#define PannerNode_h
  
  #include "AudioBus.h"
  #include "AudioGain.h"
@@ -37,14 +37,14 @@
  
  namespace WebCore {
  
-// AudioPannerNode is an AudioNode with one input and one output.
+// PannerNode is an AudioNode with one input and one output.
  // It positions a sound in 3D space, with the exact effect dependent on the panning model.
  // It has a position and an orientation in 3D space which is relative to the position and orientation of the context's AudioListener.
  // A distance effect will attenuate the gain as the position moves away from the listener.
  // A cone effect will attenuate the gain as the orientation moves away from the listener.
  // All of these effects follow the OpenAL specification very closely.
  
-class AudioPannerNode : public AudioNode {
+class PannerNode : public AudioNode {
  public:
      // These must be defined as in the .idl file and must match those in the Panner class.
      enum {
@@ -61,12 +61,12 @@ public:
          EXPONENTIAL_DISTANCE = 2,
      };
      
-    static PassRefPtr<AudioPannerNode> create(AudioContext* context, float sampleRate)
+    static PassRefPtr<PannerNode> create(AudioContext* context, float sampleRate)
      {
-        return adoptRef(new AudioPannerNode(context, sampleRate));
+        return adoptRef(new PannerNode(context, sampleRate));
      }
  
-    virtual ~AudioPannerNode();
+    virtual ~PannerNode();
  
      // AudioNode
      virtual void process(size_t framesToProcess);
@@ -128,7 +128,7 @@ public:
      virtual double latencyTime() const OVERRIDE { return m_panner ? m_panner->latencyTime() : 0; }
  
  private:
-    AudioPannerNode(AudioContext*, float sampleRate);
+    PannerNode(AudioContext*, float sampleRate);
  
      // Returns the combined distance and cone gain attenuation.
      float distanceConeGain();
@@ -156,4 +156,4 @@ private:
  
  } // namespace WebCore
  
-#endif // AudioPannerNode_h
+#endif // PannerNode_h
diff --git a/Source/WebCore/Modules/webaudio/AudioPannerNode.idl b/Source/WebCore/Modules/webaudio/PannerNode.idl

similarity index 98%

rename from Source/WebCore/Modules/webaudio/AudioPannerNode.idl

rename to Source/WebCore/Modules/webaudio/PannerNode.idl

index 653c6d856ac9707b73c0e80b5eb22115b6ef144e..8ee8a354ad139fb1d901c9029ca7378cf22256c9 100644 (file)
--- a/Source/WebCore/Modules/webaudio/AudioPannerNode.idl
+++ b/Source/WebCore/Modules/webaudio/PannerNode.idl
@@ -25,7 +25,7 @@
  [
      Conditional=WEB_AUDIO,
      JSGenerateToJSObject
-] interface AudioPannerNode : AudioNode {
+] interface PannerNode : AudioNode {
      // Panning model
      const unsigned short EQUALPOWER = 0;
      const unsigned short HRTF = 1;
diff --git a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp

similarity index 88%

rename from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp

rename to Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp

index be60af887d61c32e81f52be1c8f27f7547df9a19..2361a3ad01dd0f797e9f9c91f6c1309ecae5bed1 100644 (file)
--- a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp
+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp
@@ -26,7 +26,7 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "JavaScriptAudioNode.h"
+#include "ScriptProcessorNode.h"
  
  #include "AudioBuffer.h"
  #include "AudioBus.h"
@@ -42,7 +42,7 @@ namespace WebCore {
  
  const size_t DefaultBufferSize = 4096;
  
-PassRefPtr<JavaScriptAudioNode> JavaScriptAudioNode::create(AudioContext* context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
+PassRefPtr<ScriptProcessorNode> ScriptProcessorNode::create(AudioContext* context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
  {
      // Check for valid buffer size.
      switch (bufferSize) {
@@ -67,10 +67,10 @@ PassRefPtr<JavaScriptAudioNode> JavaScriptAudioNode::create(AudioContext* contex
      if (numberOfOutputChannels > AudioContext::maxNumberOfChannels())
          return 0;
  
-    return adoptRef(new JavaScriptAudioNode(context, sampleRate, bufferSize, numberOfInputChannels, numberOfOutputChannels));
+    return adoptRef(new ScriptProcessorNode(context, sampleRate, bufferSize, numberOfInputChannels, numberOfOutputChannels));
  }
  
-JavaScriptAudioNode::JavaScriptAudioNode(AudioContext* context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
+ScriptProcessorNode::ScriptProcessorNode(AudioContext* context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
      : AudioNode(context, sampleRate)
      , m_doubleBufferIndex(0)
      , m_doubleBufferIndexForEvent(0)
@@ -95,12 +95,12 @@ JavaScriptAudioNode::JavaScriptAudioNode(AudioContext* context, float sampleRate
      initialize();
  }
  
-JavaScriptAudioNode::~JavaScriptAudioNode()
+ScriptProcessorNode::~ScriptProcessorNode()
  {
      uninitialize();
  }
  
-void JavaScriptAudioNode::initialize()
+void ScriptProcessorNode::initialize()
  {
      if (isInitialized())
          return;
@@ -120,7 +120,7 @@ void JavaScriptAudioNode::initialize()
      AudioNode::initialize();
  }
  
-void JavaScriptAudioNode::uninitialize()
+void ScriptProcessorNode::uninitialize()
  {
      if (!isInitialized())
          return;
@@ -131,10 +131,10 @@ void JavaScriptAudioNode::uninitialize()
      AudioNode::uninitialize();
  }
  
-void JavaScriptAudioNode::process(size_t framesToProcess)
+void ScriptProcessorNode::process(size_t framesToProcess)
  {
      // Discussion about inputs and outputs:
-    // As in other AudioNodes, JavaScriptAudioNode uses an AudioBus for its input and output (see inputBus and outputBus below).
+    // As in other AudioNodes, ScriptProcessorNode uses an AudioBus for its input and output (see inputBus and outputBus below).
      // Additionally, there is a double-buffering for input and output which is exposed directly to JavaScript (see inputBuffer and outputBuffer below).
      // This node is the producer for inputBuffer and the consumer for outputBuffer.
      // The JavaScript code is the consumer of inputBuffer and the producer for outputBuffer.
@@ -143,7 +143,7 @@ void JavaScriptAudioNode::process(size_t framesToProcess)
      AudioBus* inputBus = this->input(0)->bus();
      AudioBus* outputBus = this->output(0)->bus();
  
-    // Get input and output buffers.  We double-buffer both the input and output sides.
+    // Get input and output buffers. We double-buffer both the input and output sides.
      unsigned doubleBufferIndex = this->doubleBufferIndex();
      bool isDoubleBufferIndexGood = doubleBufferIndex < 2 && doubleBufferIndex < m_inputBuffers.size() && doubleBufferIndex < m_outputBuffers.size();
      ASSERT(isDoubleBufferIndexGood);
@@ -197,7 +197,7 @@ void JavaScriptAudioNode::process(size_t framesToProcess)
          // Avoid building up requests on the main thread to fire process events when they're not being handled.
          // This could be a problem if the main thread is very busy doing other things and is being held up handling previous requests.
          if (m_isRequestOutstanding) {
-            // We're late in handling the previous request.  The main thread must be very busy.
+            // We're late in handling the previous request. The main thread must be very busy.
              // The best we can do is clear out the buffer ourself here.
              outputBuffer->zero();            
          } else {
@@ -214,9 +214,9 @@ void JavaScriptAudioNode::process(size_t framesToProcess)
      }
  }
  
-void JavaScriptAudioNode::fireProcessEventDispatch(void* userData)
+void ScriptProcessorNode::fireProcessEventDispatch(void* userData)
  {
-    JavaScriptAudioNode* jsAudioNode = static_cast<JavaScriptAudioNode*>(userData);
+    ScriptProcessorNode* jsAudioNode = static_cast<ScriptProcessorNode*>(userData);
      ASSERT(jsAudioNode);
      if (!jsAudioNode)
          return;
@@ -227,7 +227,7 @@ void JavaScriptAudioNode::fireProcessEventDispatch(void* userData)
      jsAudioNode->deref();
  }
  
-void JavaScriptAudioNode::fireProcessEvent()
+void ScriptProcessorNode::fireProcessEvent()
  {
      ASSERT(isMainThread() && m_isRequestOutstanding);
      
@@ -252,7 +252,7 @@ void JavaScriptAudioNode::fireProcessEvent()
      }
  }
  
-void JavaScriptAudioNode::reset()
+void ScriptProcessorNode::reset()
  {
      m_bufferReadWriteIndex = 0;
      m_doubleBufferIndex = 0;
@@ -263,22 +263,22 @@ void JavaScriptAudioNode::reset()
      }
  }
  
-const AtomicString& JavaScriptAudioNode::interfaceName() const
+const AtomicString& ScriptProcessorNode::interfaceName() const
  {
-    return eventNames().interfaceForJavaScriptAudioNode;
+    return eventNames().interfaceForScriptProcessorNode;
  }
  
-ScriptExecutionContext* JavaScriptAudioNode::scriptExecutionContext() const
+ScriptExecutionContext* ScriptProcessorNode::scriptExecutionContext() const
  {
-    return const_cast<JavaScriptAudioNode*>(this)->context()->document();
+    return const_cast<ScriptProcessorNode*>(this)->context()->document();
  }
  
-double JavaScriptAudioNode::tailTime() const
+double ScriptProcessorNode::tailTime() const
  {
      return std::numeric_limits<double>::infinity();
  }
  
-double JavaScriptAudioNode::latencyTime() const
+double ScriptProcessorNode::latencyTime() const
  {
      return std::numeric_limits<double>::infinity();
  }
diff --git a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h

similarity index 92%

rename from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h

rename to Source/WebCore/Modules/webaudio/ScriptProcessorNode.h

index 4098cfc8923c728096fd5d5927f5d37cdfa4fded..02eb32737277a13be63ca167837aab10483955c9 100644 (file)
--- a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h
+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h
@@ -22,8 +22,8 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-#ifndef JavaScriptAudioNode_h
-#define JavaScriptAudioNode_h
+#ifndef ScriptProcessorNode_h
+#define ScriptProcessorNode_h
  
  #include "ActiveDOMObject.h"
  #include "AudioBus.h"
@@ -41,22 +41,22 @@ class AudioBuffer;
  class AudioContext;
  class AudioProcessingEvent;
  
-// JavaScriptAudioNode is an AudioNode which allows for arbitrary synthesis or processing directly using JavaScript.
+// ScriptProcessorNode is an AudioNode which allows for arbitrary synthesis or processing directly using JavaScript.
  // The API allows for a variable number of inputs and outputs, although it must have at least one input or output.
  // This basic implementation supports no more than one input and output.
  // The "onaudioprocess" attribute is an event listener which will get called periodically with an AudioProcessingEvent which has
  // AudioBuffers for each input and output.
  
  // FIXME: EventTarget should be introduced at the base of the inheritance hierarchy (i.e., as a base class for AudioNode).
-class JavaScriptAudioNode : public AudioNode, public EventTarget {
+class ScriptProcessorNode : public AudioNode, public EventTarget {
  public:
      // bufferSize must be one of the following values: 256, 512, 1024, 2048, 4096, 8192, 16384.
      // This value controls how frequently the onaudioprocess event handler is called and how many sample-frames need to be processed each call.
      // Lower numbers for bufferSize will result in a lower (better) latency. Higher numbers will be necessary to avoid audio breakup and glitches.
      // The value chosen must carefully balance between latency and audio quality.
-    static PassRefPtr<JavaScriptAudioNode> create(AudioContext*, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
+    static PassRefPtr<ScriptProcessorNode> create(AudioContext*, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
  
-    virtual ~JavaScriptAudioNode();
+    virtual ~ScriptProcessorNode();
  
      // AudioNode
      virtual void process(size_t framesToProcess);
@@ -82,7 +82,7 @@ private:
      virtual double tailTime() const OVERRIDE;
      virtual double latencyTime() const OVERRIDE;
  
-    JavaScriptAudioNode(AudioContext*, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
+    ScriptProcessorNode(AudioContext*, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
  
      static void fireProcessEventDispatch(void* userData);
      void fireProcessEvent();
@@ -111,4 +111,4 @@ private:
  
  } // namespace WebCore
  
-#endif // JavaScriptAudioNode_h
+#endif // ScriptProcessorNode_h
diff --git a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.idl b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl

similarity index 97%

rename from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.idl

rename to Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl

index 4326642223e4815497baee8abf0aeb6c19059126..19d4bb274f3ba93bce15b0f3d5d39f483ac440b6 100644 (file)
--- a/Source/WebCore/Modules/webaudio/JavaScriptAudioNode.idl
+++ b/Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl
@@ -28,7 +28,7 @@
      JSGenerateToJSObject,
      JSCustomMarkFunction,
      EventTarget
-] interface JavaScriptAudioNode : AudioNode {
+] interface ScriptProcessorNode : AudioNode {
      // Rendering callback
      attribute EventListener onaudioprocess;
      
diff --git a/Source/WebCore/Modules/webaudio/WaveTable.cpp b/Source/WebCore/Modules/webaudio/WaveTable.cpp

index 92e944bf508b4c7097032727a14779f915542779..8bd651c2522e021f1dc049519ba853995b93ded5 100644 (file)
--- a/Source/WebCore/Modules/webaudio/WaveTable.cpp
+++ b/Source/WebCore/Modules/webaudio/WaveTable.cpp
@@ -33,7 +33,7 @@
  #include "WaveTable.h"
  
  #include "FFTFrame.h"
-#include "Oscillator.h"
+#include "OscillatorNode.h"
  #include "VectorMath.h"
  #include <algorithm>
  #include <wtf/OwnPtr.h>
@@ -62,28 +62,28 @@ PassRefPtr<WaveTable> WaveTable::create(float sampleRate, Float32Array* real, Fl
  PassRefPtr<WaveTable> WaveTable::createSine(float sampleRate)
  {
      RefPtr<WaveTable> waveTable = adoptRef(new WaveTable(sampleRate));
-    waveTable->generateBasicWaveform(Oscillator::SINE);
+    waveTable->generateBasicWaveform(OscillatorNode::SINE);
      return waveTable;
  }
  
  PassRefPtr<WaveTable> WaveTable::createSquare(float sampleRate)
  {
      RefPtr<WaveTable> waveTable = adoptRef(new WaveTable(sampleRate));
-    waveTable->generateBasicWaveform(Oscillator::SQUARE);
+    waveTable->generateBasicWaveform(OscillatorNode::SQUARE);
      return waveTable;
  }
  
  PassRefPtr<WaveTable> WaveTable::createSawtooth(float sampleRate)
  {
      RefPtr<WaveTable> waveTable = adoptRef(new WaveTable(sampleRate));
-    waveTable->generateBasicWaveform(Oscillator::SAWTOOTH);
+    waveTable->generateBasicWaveform(OscillatorNode::SAWTOOTH);
      return waveTable;
  }
  
  PassRefPtr<WaveTable> WaveTable::createTriangle(float sampleRate)
  {
      RefPtr<WaveTable> waveTable = adoptRef(new WaveTable(sampleRate));
-    waveTable->generateBasicWaveform(Oscillator::TRIANGLE);
+    waveTable->generateBasicWaveform(OscillatorNode::TRIANGLE);
      return waveTable;
  }
  
@@ -244,22 +244,22 @@ void WaveTable::generateBasicWaveform(int shape)
          // Calculate Fourier coefficients depending on the shape.
          // Note that the overall scaling (magnitude) of the waveforms is normalized in createBandLimitedTables().
          switch (shape) {
-        case Oscillator::SINE:
+        case OscillatorNode::SINE:
              // Standard sine wave function.
              a = 0;
              b = (n == 1) ? 1 : 0;
              break;
-        case Oscillator::SQUARE:
+        case OscillatorNode::SQUARE:
              // Square-shaped waveform with the first half its maximum value and the second half its minimum value.
              a = 0;
              b = invOmega * ((n & 1) ? 2 : 0);
              break;
-        case Oscillator::SAWTOOTH:
+        case OscillatorNode::SAWTOOTH:
              // Sawtooth-shaped waveform with the first half ramping from zero to maximum and the second half from minimum to zero.
              a = 0;
              b = -invOmega * cos(0.5 * omega);
              break;
-        case Oscillator::TRIANGLE:
+        case OscillatorNode::TRIANGLE:
              // Triangle-shaped waveform going from its maximum value to its minimum value then back to the maximum value.
              a = (4 - 4 * cos(0.5 * omega)) / (n * n * piFloat * piFloat);
              b = 0;
diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri

index 8faeb80c4ca7614e426637046a1b090906b24e6e..3a04feb0cec7dcce5097329cc82617b19b7020ee 100644 (file)
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -3266,17 +3266,17 @@ enable?(WEB_AUDIO) {
          Modules/webaudio/AudioBufferCallback.h \
          Modules/webaudio/AudioBuffer.h \
          Modules/webaudio/AudioBufferSourceNode.h \
-        Modules/webaudio/AudioChannelMerger.h \
-        Modules/webaudio/AudioChannelSplitter.h \
+        Modules/webaudio/ChannelMergerNode.h \
+        Modules/webaudio/ChannelSplitterNode.h \
          Modules/webaudio/AudioContext.h \
          Modules/webaudio/AudioDestinationNode.h \
          Modules/webaudio/AudioGain.h \
-        Modules/webaudio/AudioGainNode.h \
+        Modules/webaudio/GainNode.h \
          Modules/webaudio/AudioListener.h \
          Modules/webaudio/AudioNode.h \
          Modules/webaudio/AudioNodeInput.h \
          Modules/webaudio/AudioNodeOutput.h \
-        Modules/webaudio/AudioPannerNode.h \
+        Modules/webaudio/PannerNode.h \
          Modules/webaudio/AudioParam.h \
          Modules/webaudio/AudioParamTimeline.h \
          Modules/webaudio/AudioProcessingEvent.h \
@@ -3292,14 +3292,14 @@ enable?(WEB_AUDIO) {
          Modules/webaudio/DelayNode.h \
          Modules/webaudio/DelayProcessor.h \
          Modules/webaudio/DynamicsCompressorNode.h \
-        Modules/webaudio/JavaScriptAudioNode.h \
+        Modules/webaudio/ScriptProcessorNode.h \
          Modules/webaudio/MediaElementAudioSourceNode.h \
          Modules/webaudio/MediaStreamAudioSourceNode.h \
          Modules/webaudio/OfflineAudioCompletionEvent.h \
          Modules/webaudio/OfflineAudioDestinationNode.h \
-        Modules/webaudio/Oscillator.h \
+        Modules/webaudio/OscillatorNode.h \
          Modules/webaudio/RealtimeAnalyser.h \
-        Modules/webaudio/RealtimeAnalyserNode.h \
+        Modules/webaudio/AnalyserNode.h \
          Modules/webaudio/WaveShaperDSPKernel.h \
          Modules/webaudio/WaveShaperNode.h \
          Modules/webaudio/WaveShaperProcessor.h \
@@ -3350,22 +3350,22 @@ enable?(WEB_AUDIO) {
          bindings/js/JSAudioBufferSourceNodeCustom.cpp \
          bindings/js/JSAudioContextCustom.cpp \
          bindings/js/JSDOMWindowWebAudioCustom.cpp \
-        bindings/js/JSJavaScriptAudioNodeCustom.cpp \
+        bindings/js/JSScriptProcessorNodeCustom.cpp \
          Modules/webaudio/AsyncAudioDecoder.cpp \
          Modules/webaudio/AudioBasicInspectorNode.cpp \
          Modules/webaudio/AudioBasicProcessorNode.cpp \
          Modules/webaudio/AudioBuffer.cpp \
          Modules/webaudio/AudioBufferSourceNode.cpp \
-        Modules/webaudio/AudioChannelMerger.cpp \
-        Modules/webaudio/AudioChannelSplitter.cpp \
+        Modules/webaudio/ChannelMergerNode.cpp \
+        Modules/webaudio/ChannelSplitterNode.cpp \
          Modules/webaudio/AudioContext.cpp \
          Modules/webaudio/AudioDestinationNode.cpp \
-        Modules/webaudio/AudioGainNode.cpp \
+        Modules/webaudio/GainNode.cpp \
          Modules/webaudio/AudioListener.cpp \
          Modules/webaudio/AudioNode.cpp \
          Modules/webaudio/AudioNodeInput.cpp \
          Modules/webaudio/AudioNodeOutput.cpp \
-        Modules/webaudio/AudioPannerNode.cpp \
+        Modules/webaudio/PannerNode.cpp \
          Modules/webaudio/AudioParam.cpp \
          Modules/webaudio/AudioParamTimeline.cpp \
          Modules/webaudio/AudioProcessingEvent.cpp \
@@ -3380,14 +3380,14 @@ enable?(WEB_AUDIO) {
          Modules/webaudio/DelayNode.cpp \
          Modules/webaudio/DelayProcessor.cpp \
          Modules/webaudio/DynamicsCompressorNode.cpp \
-        Modules/webaudio/JavaScriptAudioNode.cpp \
+        Modules/webaudio/ScriptProcessorNode.cpp \
          Modules/webaudio/MediaElementAudioSourceNode.cpp \
          Modules/webaudio/MediaStreamAudioSourceNode.cpp \
          Modules/webaudio/OfflineAudioCompletionEvent.cpp \
          Modules/webaudio/OfflineAudioDestinationNode.cpp \
-        Modules/webaudio/Oscillator.cpp \
+        Modules/webaudio/OscillatorNode.cpp \
          Modules/webaudio/RealtimeAnalyser.cpp \
-        Modules/webaudio/RealtimeAnalyserNode.cpp \
+        Modules/webaudio/AnalyserNode.cpp \
          Modules/webaudio/WaveShaperDSPKernel.cpp \
          Modules/webaudio/WaveShaperNode.cpp \
          Modules/webaudio/WaveShaperProcessor.cpp \
diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake

index 3e60a3e881f3609bfc443aa92ad05badd5062240..ba6ce697bf53620cf5b2ca9c05cd7bd275bc6437 100644 (file)
--- a/Source/WebCore/UseJSC.cmake
+++ b/Source/WebCore/UseJSC.cmake
@@ -273,7 +273,7 @@ IF (ENABLE_WEB_AUDIO)
      LIST(APPEND WebCore_SOURCES
          bindings/js/JSAudioBufferSourceNodeCustom.cpp
          bindings/js/JSAudioContextCustom.cpp
-        bindings/js/JSJavaScriptAudioNodeCustom.cpp
+        bindings/js/JSScriptProcessorNodeCustom.cpp
      )
  ENDIF ()
  
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi

index 1b77d673a6287a85b21d5f3115423b73530809c7..246d66a4f3660311a2e099a6b2b965d6c6eba7ec 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -905,15 +905,15 @@
              'Modules/webaudio/AudioBuffer.idl',
              'Modules/webaudio/AudioBufferCallback.idl',
              'Modules/webaudio/AudioBufferSourceNode.idl',
-            'Modules/webaudio/AudioChannelMerger.idl',
-            'Modules/webaudio/AudioChannelSplitter.idl',
+            'Modules/webaudio/ChannelMergerNode.idl',
+            'Modules/webaudio/ChannelSplitterNode.idl',
              'Modules/webaudio/AudioContext.idl',
              'Modules/webaudio/AudioDestinationNode.idl',
              'Modules/webaudio/AudioGain.idl',
-            'Modules/webaudio/AudioGainNode.idl',
+            'Modules/webaudio/GainNode.idl',
              'Modules/webaudio/AudioListener.idl',
              'Modules/webaudio/AudioNode.idl',
-            'Modules/webaudio/AudioPannerNode.idl',
+            'Modules/webaudio/PannerNode.idl',
              'Modules/webaudio/AudioParam.idl',
              'Modules/webaudio/AudioProcessingEvent.idl',
              'Modules/webaudio/AudioSourceNode.idl',
@@ -922,12 +922,12 @@
              'Modules/webaudio/DelayNode.idl',
              'Modules/webaudio/DOMWindowWebAudio.idl',
              'Modules/webaudio/DynamicsCompressorNode.idl',
-            'Modules/webaudio/JavaScriptAudioNode.idl',
+            'Modules/webaudio/ScriptProcessorNode.idl',
              'Modules/webaudio/MediaElementAudioSourceNode.idl',
              'Modules/webaudio/MediaStreamAudioSourceNode.idl',
              'Modules/webaudio/OfflineAudioCompletionEvent.idl',
-            'Modules/webaudio/Oscillator.idl',
-            'Modules/webaudio/RealtimeAnalyserNode.idl',
+            'Modules/webaudio/OscillatorNode.idl',
+            'Modules/webaudio/AnalyserNode.idl',
              'Modules/webaudio/WaveShaperNode.idl',
              'Modules/webaudio/WaveTable.idl',
              'Modules/webdatabase/DOMWindowWebDatabase.idl',
@@ -1698,17 +1698,17 @@
              'Modules/webaudio/AudioBufferCallback.h',
              'Modules/webaudio/AudioBufferSourceNode.cpp',
              'Modules/webaudio/AudioBufferSourceNode.h',
-            'Modules/webaudio/AudioChannelMerger.cpp',
-            'Modules/webaudio/AudioChannelMerger.h',
-            'Modules/webaudio/AudioChannelSplitter.cpp',
-            'Modules/webaudio/AudioChannelSplitter.h',
+            'Modules/webaudio/ChannelMergerNode.cpp',
+            'Modules/webaudio/ChannelMergerNode.h',
+            'Modules/webaudio/ChannelSplitterNode.cpp',
+            'Modules/webaudio/ChannelSplitterNode.h',
              'Modules/webaudio/AudioContext.cpp',
              'Modules/webaudio/AudioContext.h',
              'Modules/webaudio/AudioDestinationNode.cpp',
              'Modules/webaudio/AudioDestinationNode.h',
              'Modules/webaudio/AudioGain.h',
-            'Modules/webaudio/AudioGainNode.cpp',
-            'Modules/webaudio/AudioGainNode.h',
+            'Modules/webaudio/GainNode.cpp',
+            'Modules/webaudio/GainNode.h',
              'Modules/webaudio/AudioListener.cpp',
              'Modules/webaudio/AudioListener.h',
              'Modules/webaudio/AudioNode.cpp',
@@ -1717,8 +1717,8 @@
              'Modules/webaudio/AudioNodeInput.h',
              'Modules/webaudio/AudioNodeOutput.cpp',
              'Modules/webaudio/AudioNodeOutput.h',
-            'Modules/webaudio/AudioPannerNode.cpp',
-            'Modules/webaudio/AudioPannerNode.h',
+            'Modules/webaudio/PannerNode.cpp',
+            'Modules/webaudio/PannerNode.h',
              'Modules/webaudio/AudioParam.cpp',
              'Modules/webaudio/AudioParam.h',
              'Modules/webaudio/AudioParamTimeline.cpp',
@@ -1750,8 +1750,8 @@
              'Modules/webaudio/DelayProcessor.h',
              'Modules/webaudio/DynamicsCompressorNode.cpp',
              'Modules/webaudio/DynamicsCompressorNode.h',
-            'Modules/webaudio/JavaScriptAudioNode.cpp',
-            'Modules/webaudio/JavaScriptAudioNode.h',
+            'Modules/webaudio/ScriptProcessorNode.cpp',
+            'Modules/webaudio/ScriptProcessorNode.h',
              'Modules/webaudio/MediaElementAudioSourceNode.cpp',
              'Modules/webaudio/MediaElementAudioSourceNode.h',
              'Modules/webaudio/MediaStreamAudioSourceNode.cpp',
@@ -1760,12 +1760,12 @@
              'Modules/webaudio/OfflineAudioCompletionEvent.h',
              'Modules/webaudio/OfflineAudioDestinationNode.cpp',
              'Modules/webaudio/OfflineAudioDestinationNode.h',
-            'Modules/webaudio/Oscillator.cpp',
-            'Modules/webaudio/Oscillator.h',
+            'Modules/webaudio/OscillatorNode.cpp',
+            'Modules/webaudio/OscillatorNode.h',
              'Modules/webaudio/RealtimeAnalyser.cpp',
              'Modules/webaudio/RealtimeAnalyser.h',
-            'Modules/webaudio/RealtimeAnalyserNode.cpp',
-            'Modules/webaudio/RealtimeAnalyserNode.h',
+            'Modules/webaudio/AnalyserNode.cpp',
+            'Modules/webaudio/AnalyserNode.h',
              'Modules/webaudio/WaveShaperDSPKernel.cpp',
              'Modules/webaudio/WaveShaperDSPKernel.h',
              'Modules/webaudio/WaveShaperNode.cpp',
@@ -2097,7 +2097,7 @@
              'bindings/js/JSInjectedScriptHostCustom.cpp',
              'bindings/js/JSInjectedScriptManager.cpp',
              'bindings/js/JSInspectorFrontendHostCustom.cpp',
-            'bindings/js/JSJavaScriptAudioNodeCustom.cpp',
+            'bindings/js/JSScriptProcessorNodeCustom.cpp',
              'bindings/js/JSJavaScriptCallFrameCustom.cpp',
              'bindings/js/JSLazyEventListener.cpp',
              'bindings/js/JSLazyEventListener.h',
@@ -7313,24 +7313,24 @@
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioBuffer.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioBufferSourceNode.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioBufferSourceNode.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioChannelMerger.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioChannelMerger.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioChannelSplitter.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioChannelSplitter.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSChannelMergerNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSChannelMergerNode.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSChannelSplitterNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSChannelSplitterNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioContext.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioContext.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioDestinationNode.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioDestinationNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioGain.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioGain.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioGainNode.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioGainNode.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSGainNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSGainNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioListener.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioListener.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioNode.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioNode.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioPannerNode.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioPannerNode.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPannerNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSPannerNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioParam.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioParam.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAudioProcessingEvent.cpp',
@@ -7722,8 +7722,8 @@
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSInt32Array.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSInt8Array.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSInt8Array.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSJavaScriptAudioNode.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSJavaScriptAudioNode.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSScriptProcessorNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSScriptProcessorNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSJavaScriptCallFrame.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSJavaScriptCallFrame.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSKeyboardEvent.cpp',
@@ -7819,8 +7819,8 @@
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRange.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRangeException.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRangeException.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRealtimeAnalyserNode.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRealtimeAnalyserNode.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAnalyserNode.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSAnalyserNode.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRect.cpp',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSRect.h',
              '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSQLError.cpp',
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 4b03768926337c67b797ef8254626c3858aae361..e260a23bbe5438eb96618f73ac0d405e885861f6 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -6353,17 +6353,11 @@
                 FD315FF912B0267600C1A359 /* AudioBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FAF12B0267500C1A359 /* AudioBuffer.h */; };
                 FD315FFB12B0267600C1A359 /* AudioBufferSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FB112B0267500C1A359 /* AudioBufferSourceNode.cpp */; };
                 FD315FFC12B0267600C1A359 /* AudioBufferSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FB212B0267500C1A359 /* AudioBufferSourceNode.h */; };
-               FD315FFE12B0267600C1A359 /* AudioChannelMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FB412B0267500C1A359 /* AudioChannelMerger.cpp */; };
-               FD315FFF12B0267600C1A359 /* AudioChannelMerger.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FB512B0267500C1A359 /* AudioChannelMerger.h */; };
-               FD31600112B0267600C1A359 /* AudioChannelSplitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FB712B0267500C1A359 /* AudioChannelSplitter.cpp */; };
-               FD31600212B0267600C1A359 /* AudioChannelSplitter.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FB812B0267500C1A359 /* AudioChannelSplitter.h */; };
                 FD31600412B0267600C1A359 /* AudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FBA12B0267500C1A359 /* AudioContext.cpp */; };
                 FD31600512B0267600C1A359 /* AudioContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FBB12B0267500C1A359 /* AudioContext.h */; };
                 FD31600712B0267600C1A359 /* AudioDestinationNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FBD12B0267500C1A359 /* AudioDestinationNode.cpp */; };
                 FD31600812B0267600C1A359 /* AudioDestinationNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FBE12B0267500C1A359 /* AudioDestinationNode.h */; };
                 FD31600A12B0267600C1A359 /* AudioGain.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FC012B0267500C1A359 /* AudioGain.h */; };
-               FD31600C12B0267600C1A359 /* AudioGainNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FC212B0267500C1A359 /* AudioGainNode.cpp */; };
-               FD31600D12B0267600C1A359 /* AudioGainNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FC312B0267500C1A359 /* AudioGainNode.h */; };
                 FD31600F12B0267600C1A359 /* AudioListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FC512B0267500C1A359 /* AudioListener.cpp */; };
                 FD31601012B0267600C1A359 /* AudioListener.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FC612B0267500C1A359 /* AudioListener.h */; };
                 FD31601212B0267600C1A359 /* AudioNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FC812B0267500C1A359 /* AudioNode.cpp */; };
@@ -6372,8 +6366,6 @@
                 FD31601612B0267600C1A359 /* AudioNodeInput.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FCC12B0267500C1A359 /* AudioNodeInput.h */; };
                 FD31601712B0267600C1A359 /* AudioNodeOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FCD12B0267500C1A359 /* AudioNodeOutput.cpp */; };
                 FD31601812B0267600C1A359 /* AudioNodeOutput.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FCE12B0267500C1A359 /* AudioNodeOutput.h */; };
-               FD31601912B0267600C1A359 /* AudioPannerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FCF12B0267500C1A359 /* AudioPannerNode.cpp */; };
-               FD31601A12B0267600C1A359 /* AudioPannerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FD012B0267500C1A359 /* AudioPannerNode.h */; };
                 FD31601C12B0267600C1A359 /* AudioParam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FD212B0267500C1A359 /* AudioParam.cpp */; };
                 FD31601D12B0267600C1A359 /* AudioParam.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FD312B0267500C1A359 /* AudioParam.h */; };
                 FD31601F12B0267600C1A359 /* AudioProcessingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FD512B0267600C1A359 /* AudioProcessingEvent.cpp */; };
@@ -6383,6 +6375,10 @@
                 FD31602512B0267600C1A359 /* BiquadDSPKernel.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FDB12B0267600C1A359 /* BiquadDSPKernel.h */; };
                 FD31602612B0267600C1A359 /* BiquadProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FDC12B0267600C1A359 /* BiquadProcessor.cpp */; };
                 FD31602712B0267600C1A359 /* BiquadProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FDD12B0267600C1A359 /* BiquadProcessor.h */; };
+               FD315FFE12B0267600C1A359 /* ChannelMergerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FB412B0267500C1A359 /* ChannelMergerNode.cpp */; };
+               FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FB512B0267500C1A359 /* ChannelMergerNode.h */; };
+               FD31600112B0267600C1A359 /* ChannelSplitterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FB712B0267500C1A359 /* ChannelSplitterNode.cpp */; };
+               FD31600212B0267600C1A359 /* ChannelSplitterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FB812B0267500C1A359 /* ChannelSplitterNode.h */; };
                 FD31602812B0267600C1A359 /* ConvolverNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FDE12B0267600C1A359 /* ConvolverNode.cpp */; };
                 FD31602912B0267600C1A359 /* ConvolverNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FDF12B0267600C1A359 /* ConvolverNode.h */; };
                 FD31602B12B0267600C1A359 /* DelayDSPKernel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FE112B0267600C1A359 /* DelayDSPKernel.cpp */; };
@@ -6391,12 +6387,16 @@
                 FD31602E12B0267600C1A359 /* DelayNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FE412B0267600C1A359 /* DelayNode.h */; };
                 FD31603012B0267600C1A359 /* DelayProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FE612B0267600C1A359 /* DelayProcessor.cpp */; };
                 FD31603112B0267600C1A359 /* DelayProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FE712B0267600C1A359 /* DelayProcessor.h */; };
-               FD31603512B0267600C1A359 /* JavaScriptAudioNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FEB12B0267600C1A359 /* JavaScriptAudioNode.cpp */; };
-               FD31603612B0267600C1A359 /* JavaScriptAudioNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FEC12B0267600C1A359 /* JavaScriptAudioNode.h */; };
+               FD31600C12B0267600C1A359 /* GainNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FC212B0267500C1A359 /* GainNode.cpp */; };
+               FD31600D12B0267600C1A359 /* GainNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FC312B0267500C1A359 /* GainNode.h */; };
+               FD31601912B0267600C1A359 /* PannerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FCF12B0267500C1A359 /* PannerNode.cpp */; };
+               FD31601A12B0267600C1A359 /* PannerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FD012B0267500C1A359 /* PannerNode.h */; };
                 FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FF112B0267600C1A359 /* RealtimeAnalyser.cpp */; };
                 FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FF212B0267600C1A359 /* RealtimeAnalyser.h */; };
-               FD31603D12B0267600C1A359 /* RealtimeAnalyserNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FF312B0267600C1A359 /* RealtimeAnalyserNode.cpp */; };
-               FD31603E12B0267600C1A359 /* RealtimeAnalyserNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FF412B0267600C1A359 /* RealtimeAnalyserNode.h */; };
+               FD31603512B0267600C1A359 /* ScriptProcessorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FEB12B0267600C1A359 /* ScriptProcessorNode.cpp */; };
+               FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FEC12B0267600C1A359 /* ScriptProcessorNode.h */; };
+               FD31603D12B0267600C1A359 /* AnalyserNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD315FF312B0267600C1A359 /* AnalyserNode.cpp */; };
+               FD31603E12B0267600C1A359 /* AnalyserNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD315FF412B0267600C1A359 /* AnalyserNode.h */; };
                 FD31607A12B026F700C1A359 /* AudioArray.h in Headers */ = {isa = PBXBuildFile; fileRef = FD31604412B026F700C1A359 /* AudioArray.h */; };
                 FD31607B12B026F700C1A359 /* AudioBus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD31604512B026F700C1A359 /* AudioBus.cpp */; };
                 FD31607C12B026F700C1A359 /* AudioBus.h in Headers */ = {isa = PBXBuildFile; fileRef = FD31604612B026F700C1A359 /* AudioBus.h */; };
@@ -6466,8 +6466,8 @@
                 FD5686C913AC180200B69C68 /* AsyncAudioDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD5686C713AC180200B69C68 /* AsyncAudioDecoder.cpp */; };
                 FD5686CA13AC180200B69C68 /* AsyncAudioDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = FD5686C813AC180200B69C68 /* AsyncAudioDecoder.h */; };
                 FD5686CC13AC181400B69C68 /* AudioBufferCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FD5686CB13AC181400B69C68 /* AudioBufferCallback.h */; };
-               FD581FAE1520F91F003A7A75 /* Oscillator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD581FAB1520F91F003A7A75 /* Oscillator.cpp */; };
-               FD581FAF1520F91F003A7A75 /* Oscillator.h in Headers */ = {isa = PBXBuildFile; fileRef = FD581FAC1520F91F003A7A75 /* Oscillator.h */; };
+               FD581FAE1520F91F003A7A75 /* OscillatorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD581FAB1520F91F003A7A75 /* OscillatorNode.cpp */; };
+               FD581FAF1520F91F003A7A75 /* OscillatorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD581FAC1520F91F003A7A75 /* OscillatorNode.h */; };
                 FD581FB41520F93B003A7A75 /* WaveTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD581FB11520F93B003A7A75 /* WaveTable.cpp */; };
                 FD581FB51520F93B003A7A75 /* WaveTable.h in Headers */ = {isa = PBXBuildFile; fileRef = FD581FB21520F93B003A7A75 /* WaveTable.h */; };
                 FD629EA3154B47160006D026 /* AudioBasicInspectorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD629EA1154B47160006D026 /* AudioBasicInspectorNode.h */; };
@@ -6495,40 +6495,40 @@
                 FD82D7F813D4C8BD004E4372 /* JSWaveShaperNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD82D7F613D4C8BD004E4372 /* JSWaveShaperNode.h */; };
                 FD8C46EB154608E700A5910C /* AudioScheduledSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */; };
                 FD8C46EC154608E700A5910C /* AudioScheduledSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */; };
+               FDA15EC912B03F50003A583A /* JSAnalyserNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15EC712B03F50003A583A /* JSAnalyserNode.cpp */; };
+               FDA15ECA12B03F50003A583A /* JSAnalyserNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15EC812B03F50003A583A /* JSAnalyserNode.h */; };
                 FDA15E9D12B03EE1003A583A /* JSAudioBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */; };
                 FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */; };
                 FDA15E9F12B03EE1003A583A /* JSAudioBufferSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */; };
                 FDA15EA012B03EE1003A583A /* JSAudioBufferSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8412B03EE1003A583A /* JSAudioBufferSourceNode.h */; };
-               FDA15EA112B03EE1003A583A /* JSAudioChannelMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8512B03EE1003A583A /* JSAudioChannelMerger.cpp */; };
-               FDA15EA212B03EE1003A583A /* JSAudioChannelMerger.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8612B03EE1003A583A /* JSAudioChannelMerger.h */; };
-               FDA15EA312B03EE1003A583A /* JSAudioChannelSplitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8712B03EE1003A583A /* JSAudioChannelSplitter.cpp */; };
-               FDA15EA412B03EE1003A583A /* JSAudioChannelSplitter.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8812B03EE1003A583A /* JSAudioChannelSplitter.h */; };
                 FDA15EA512B03EE1003A583A /* JSAudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8912B03EE1003A583A /* JSAudioContext.cpp */; };
                 FDA15EA612B03EE1003A583A /* JSAudioContext.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8A12B03EE1003A583A /* JSAudioContext.h */; };
                 FDA15EA712B03EE1003A583A /* JSAudioDestinationNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8B12B03EE1003A583A /* JSAudioDestinationNode.cpp */; };
                 FDA15EA812B03EE1003A583A /* JSAudioDestinationNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8C12B03EE1003A583A /* JSAudioDestinationNode.h */; };
                 FDA15EA912B03EE1003A583A /* JSAudioGain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8D12B03EE1003A583A /* JSAudioGain.cpp */; };
                 FDA15EAA12B03EE1003A583A /* JSAudioGain.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8E12B03EE1003A583A /* JSAudioGain.h */; };
-               FDA15EAB12B03EE1003A583A /* JSAudioGainNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8F12B03EE1003A583A /* JSAudioGainNode.cpp */; };
-               FDA15EAC12B03EE1003A583A /* JSAudioGainNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9012B03EE1003A583A /* JSAudioGainNode.h */; };
                 FDA15EAD12B03EE1003A583A /* JSAudioListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9112B03EE1003A583A /* JSAudioListener.cpp */; };
                 FDA15EAE12B03EE1003A583A /* JSAudioListener.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9212B03EE1003A583A /* JSAudioListener.h */; };
                 FDA15EAF12B03EE1003A583A /* JSAudioNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9312B03EE1003A583A /* JSAudioNode.cpp */; };
                 FDA15EB012B03EE1003A583A /* JSAudioNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9412B03EE1003A583A /* JSAudioNode.h */; };
-               FDA15EB112B03EE1003A583A /* JSAudioPannerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9512B03EE1003A583A /* JSAudioPannerNode.cpp */; };
-               FDA15EB212B03EE1003A583A /* JSAudioPannerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9612B03EE1003A583A /* JSAudioPannerNode.h */; };
                 FDA15EB312B03EE1003A583A /* JSAudioParam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9712B03EE1003A583A /* JSAudioParam.cpp */; };
                 FDA15EB412B03EE1003A583A /* JSAudioParam.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9812B03EE1003A583A /* JSAudioParam.h */; };
                 FDA15EB512B03EE1003A583A /* JSAudioProcessingEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9912B03EE1003A583A /* JSAudioProcessingEvent.cpp */; };
                 FDA15EB612B03EE1003A583A /* JSAudioProcessingEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9A12B03EE1003A583A /* JSAudioProcessingEvent.h */; };
                 FDA15EB712B03EE1003A583A /* JSAudioSourceNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9B12B03EE1003A583A /* JSAudioSourceNode.cpp */; };
                 FDA15EB812B03EE1003A583A /* JSAudioSourceNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9C12B03EE1003A583A /* JSAudioSourceNode.h */; };
+               FDA15EA112B03EE1003A583A /* JSChannelMergerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8512B03EE1003A583A /* JSChannelMergerNode.cpp */; };
+               FDA15EA212B03EE1003A583A /* JSChannelMergerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8612B03EE1003A583A /* JSChannelMergerNode.h */; };
+               FDA15EA312B03EE1003A583A /* JSChannelSplitterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8712B03EE1003A583A /* JSChannelSplitterNode.cpp */; };
+               FDA15EA412B03EE1003A583A /* JSChannelSplitterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E8812B03EE1003A583A /* JSChannelSplitterNode.h */; };
                 FDA15EBD12B03F0B003A583A /* JSConvolverNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15EBB12B03F0B003A583A /* JSConvolverNode.cpp */; };
                 FDA15EBE12B03F0B003A583A /* JSConvolverNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15EBC12B03F0B003A583A /* JSConvolverNode.h */; };
-               FDA15EC912B03F50003A583A /* JSRealtimeAnalyserNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15EC712B03F50003A583A /* JSRealtimeAnalyserNode.cpp */; };
-               FDA15ECA12B03F50003A583A /* JSRealtimeAnalyserNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15EC812B03F50003A583A /* JSRealtimeAnalyserNode.h */; };
-               FDA15ECD12B03F61003A583A /* JSJavaScriptAudioNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15ECB12B03F61003A583A /* JSJavaScriptAudioNode.cpp */; };
-               FDA15ECE12B03F61003A583A /* JSJavaScriptAudioNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15ECC12B03F61003A583A /* JSJavaScriptAudioNode.h */; };
+               FDA15EAB12B03EE1003A583A /* JSGainNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E8F12B03EE1003A583A /* JSGainNode.cpp */; };
+               FDA15EAC12B03EE1003A583A /* JSGainNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9012B03EE1003A583A /* JSGainNode.h */; };
+               FDA15EB112B03EE1003A583A /* JSPannerNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15E9512B03EE1003A583A /* JSPannerNode.cpp */; };
+               FDA15EB212B03EE1003A583A /* JSPannerNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15E9612B03EE1003A583A /* JSPannerNode.h */; };
+               FDA15ECD12B03F61003A583A /* JSScriptProcessorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15ECB12B03F61003A583A /* JSScriptProcessorNode.cpp */; };
+               FDA15ECE12B03F61003A583A /* JSScriptProcessorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15ECC12B03F61003A583A /* JSScriptProcessorNode.h */; };
                 FDA15ED112B03F94003A583A /* JSDelayNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA15ECF12B03F94003A583A /* JSDelayNode.cpp */; };
                 FDA15ED212B03F94003A583A /* JSDelayNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15ED012B03F94003A583A /* JSDelayNode.h */; };
                 FDA3E959134A49EF008D4B5A /* OfflineAudioCompletionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDA3E955134A49EF008D4B5A /* OfflineAudioCompletionEvent.cpp */; };
@@ -6546,17 +6546,17 @@
                 FDC54F041399B0DA008D9117 /* BiquadFilterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDC54F011399B0DA008D9117 /* BiquadFilterNode.cpp */; };
                 FDC54F051399B0DA008D9117 /* BiquadFilterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDC54F021399B0DA008D9117 /* BiquadFilterNode.h */; };
                 FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FDE2D55A159E66EB00DCCCF8 /* AudioIOCallback.h */; };
-               FDEA6242152102E200479DF0 /* JSOscillator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEA6240152102E200479DF0 /* JSOscillator.cpp */; };
-               FDEA6243152102E200479DF0 /* JSOscillator.h in Headers */ = {isa = PBXBuildFile; fileRef = FDEA6241152102E200479DF0 /* JSOscillator.h */; };
+               FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEA6240152102E200479DF0 /* JSOscillatorNode.cpp */; };
+               FDEA6243152102E200479DF0 /* JSOscillatorNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDEA6241152102E200479DF0 /* JSOscillatorNode.h */; };
                 FDEA6246152102FC00479DF0 /* JSWaveTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEA6244152102FC00479DF0 /* JSWaveTable.cpp */; };
                 FDEA6247152102FC00479DF0 /* JSWaveTable.h in Headers */ = {isa = PBXBuildFile; fileRef = FDEA6245152102FC00479DF0 /* JSWaveTable.h */; };
                 FDEAAAF312B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */; };
                 FDEAAAF412B02EE400DCF33B /* JSAudioContextCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */; };
-               FDEAAAFE12B02F4900DCF33B /* JSJavaScriptAudioNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAFD12B02F4900DCF33B /* JSJavaScriptAudioNodeCustom.cpp */; };
                 FDF09DC81399B62200688E5B /* JSBiquadFilterNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDF09DC61399B62200688E5B /* JSBiquadFilterNode.cpp */; };
                 FDF09DC91399B62200688E5B /* JSBiquadFilterNode.h in Headers */ = {isa = PBXBuildFile; fileRef = FDF09DC71399B62200688E5B /* JSBiquadFilterNode.h */; };
                 FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */; };
                 FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = FDF6BAF7134A4C9800822920 /* JSOfflineAudioCompletionEvent.h */; };
+               FDEAAAFE12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */; };
                 FDF7E9C313AC21DB00A51EAC /* JSAudioBufferCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDF7E9C113AC21DB00A51EAC /* JSAudioBufferCallback.cpp */; };
                 FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = FDF7E9C213AC21DB00A51EAC /* JSAudioBufferCallback.h */; };
                 FE6FD4880F676E5700092873 /* Coordinates.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6FD4850F676E5700092873 /* Coordinates.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -13790,12 +13790,6 @@
                 FD315FB112B0267500C1A359 /* AudioBufferSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioBufferSourceNode.cpp; sourceTree = "<group>"; };
                 FD315FB212B0267500C1A359 /* AudioBufferSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBufferSourceNode.h; sourceTree = "<group>"; };
                 FD315FB312B0267500C1A359 /* AudioBufferSourceNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioBufferSourceNode.idl; sourceTree = "<group>"; };
-               FD315FB412B0267500C1A359 /* AudioChannelMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioChannelMerger.cpp; sourceTree = "<group>"; };
-               FD315FB512B0267500C1A359 /* AudioChannelMerger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioChannelMerger.h; sourceTree = "<group>"; };
-               FD315FB612B0267500C1A359 /* AudioChannelMerger.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioChannelMerger.idl; sourceTree = "<group>"; };
-               FD315FB712B0267500C1A359 /* AudioChannelSplitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioChannelSplitter.cpp; sourceTree = "<group>"; };
-               FD315FB812B0267500C1A359 /* AudioChannelSplitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioChannelSplitter.h; sourceTree = "<group>"; };
-               FD315FB912B0267500C1A359 /* AudioChannelSplitter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioChannelSplitter.idl; sourceTree = "<group>"; };
                 FD315FBA12B0267500C1A359 /* AudioContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioContext.cpp; sourceTree = "<group>"; };
                 FD315FBB12B0267500C1A359 /* AudioContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioContext.h; sourceTree = "<group>"; };
                 FD315FBC12B0267500C1A359 /* AudioContext.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioContext.idl; sourceTree = "<group>"; };
@@ -13804,9 +13798,9 @@
                 FD315FBF12B0267500C1A359 /* AudioDestinationNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioDestinationNode.idl; sourceTree = "<group>"; };
                 FD315FC012B0267500C1A359 /* AudioGain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioGain.h; sourceTree = "<group>"; };
                 FD315FC112B0267500C1A359 /* AudioGain.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioGain.idl; sourceTree = "<group>"; };
-               FD315FC212B0267500C1A359 /* AudioGainNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioGainNode.cpp; sourceTree = "<group>"; };
-               FD315FC312B0267500C1A359 /* AudioGainNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioGainNode.h; sourceTree = "<group>"; };
-               FD315FC412B0267500C1A359 /* AudioGainNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioGainNode.idl; sourceTree = "<group>"; };
+               FD315FF312B0267600C1A359 /* AnalyserNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnalyserNode.cpp; sourceTree = "<group>"; };
+               FD315FF412B0267600C1A359 /* AnalyserNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalyserNode.h; sourceTree = "<group>"; };
+               FD315FF512B0267600C1A359 /* AnalyserNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AnalyserNode.idl; sourceTree = "<group>"; };
                 FD315FC512B0267500C1A359 /* AudioListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioListener.cpp; sourceTree = "<group>"; };
                 FD315FC612B0267500C1A359 /* AudioListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioListener.h; sourceTree = "<group>"; };
                 FD315FC712B0267500C1A359 /* AudioListener.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioListener.idl; sourceTree = "<group>"; };
@@ -13817,9 +13811,6 @@
                 FD315FCC12B0267500C1A359 /* AudioNodeInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioNodeInput.h; sourceTree = "<group>"; };
                 FD315FCD12B0267500C1A359 /* AudioNodeOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioNodeOutput.cpp; sourceTree = "<group>"; };
                 FD315FCE12B0267500C1A359 /* AudioNodeOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioNodeOutput.h; sourceTree = "<group>"; };
-               FD315FCF12B0267500C1A359 /* AudioPannerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioPannerNode.cpp; sourceTree = "<group>"; };
-               FD315FD012B0267500C1A359 /* AudioPannerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioPannerNode.h; sourceTree = "<group>"; };
-               FD315FD112B0267500C1A359 /* AudioPannerNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioPannerNode.idl; sourceTree = "<group>"; };
                 FD315FD212B0267500C1A359 /* AudioParam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioParam.cpp; sourceTree = "<group>"; };
                 FD315FD312B0267500C1A359 /* AudioParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioParam.h; sourceTree = "<group>"; };
                 FD315FD412B0267500C1A359 /* AudioParam.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioParam.idl; sourceTree = "<group>"; };
@@ -13832,6 +13823,12 @@
                 FD315FDB12B0267600C1A359 /* BiquadDSPKernel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BiquadDSPKernel.h; sourceTree = "<group>"; };
                 FD315FDC12B0267600C1A359 /* BiquadProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BiquadProcessor.cpp; sourceTree = "<group>"; };
                 FD315FDD12B0267600C1A359 /* BiquadProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BiquadProcessor.h; sourceTree = "<group>"; };
+               FD315FB412B0267500C1A359 /* ChannelMergerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChannelMergerNode.cpp; sourceTree = "<group>"; };
+               FD315FB512B0267500C1A359 /* ChannelMergerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChannelMergerNode.h; sourceTree = "<group>"; };
+               FD315FB612B0267500C1A359 /* ChannelMergerNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChannelMergerNode.idl; sourceTree = "<group>"; };
+               FD315FB712B0267500C1A359 /* ChannelSplitterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChannelSplitterNode.cpp; sourceTree = "<group>"; };
+               FD315FB812B0267500C1A359 /* ChannelSplitterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChannelSplitterNode.h; sourceTree = "<group>"; };
+               FD315FB912B0267500C1A359 /* ChannelSplitterNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChannelSplitterNode.idl; sourceTree = "<group>"; };
                 FD315FDE12B0267600C1A359 /* ConvolverNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvolverNode.cpp; sourceTree = "<group>"; };
                 FD315FDF12B0267600C1A359 /* ConvolverNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvolverNode.h; sourceTree = "<group>"; };
                 FD315FE012B0267600C1A359 /* ConvolverNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ConvolverNode.idl; sourceTree = "<group>"; };
@@ -13842,14 +13839,17 @@
                 FD315FE512B0267600C1A359 /* DelayNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DelayNode.idl; sourceTree = "<group>"; };
                 FD315FE612B0267600C1A359 /* DelayProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DelayProcessor.cpp; sourceTree = "<group>"; };
                 FD315FE712B0267600C1A359 /* DelayProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DelayProcessor.h; sourceTree = "<group>"; };
-               FD315FEB12B0267600C1A359 /* JavaScriptAudioNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JavaScriptAudioNode.cpp; sourceTree = "<group>"; };
-               FD315FEC12B0267600C1A359 /* JavaScriptAudioNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptAudioNode.h; sourceTree = "<group>"; };
-               FD315FED12B0267600C1A359 /* JavaScriptAudioNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = JavaScriptAudioNode.idl; sourceTree = "<group>"; };
+               FD315FC212B0267500C1A359 /* GainNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GainNode.cpp; sourceTree = "<group>"; };
+               FD315FC312B0267500C1A359 /* GainNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GainNode.h; sourceTree = "<group>"; };
+               FD315FC412B0267500C1A359 /* GainNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GainNode.idl; sourceTree = "<group>"; };
+               FD315FCF12B0267500C1A359 /* PannerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PannerNode.cpp; sourceTree = "<group>"; };
+               FD315FD012B0267500C1A359 /* PannerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PannerNode.h; sourceTree = "<group>"; };
+               FD315FD112B0267500C1A359 /* PannerNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PannerNode.idl; sourceTree = "<group>"; };
+               FD315FEB12B0267600C1A359 /* ScriptProcessorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProcessorNode.cpp; sourceTree = "<group>"; };
+               FD315FEC12B0267600C1A359 /* ScriptProcessorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProcessorNode.h; sourceTree = "<group>"; };
+               FD315FED12B0267600C1A359 /* ScriptProcessorNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScriptProcessorNode.idl; sourceTree = "<group>"; };
                 FD315FF112B0267600C1A359 /* RealtimeAnalyser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeAnalyser.cpp; sourceTree = "<group>"; };
                 FD315FF212B0267600C1A359 /* RealtimeAnalyser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeAnalyser.h; sourceTree = "<group>"; };
-               FD315FF312B0267600C1A359 /* RealtimeAnalyserNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeAnalyserNode.cpp; sourceTree = "<group>"; };
-               FD315FF412B0267600C1A359 /* RealtimeAnalyserNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeAnalyserNode.h; sourceTree = "<group>"; };
-               FD315FF512B0267600C1A359 /* RealtimeAnalyserNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RealtimeAnalyserNode.idl; sourceTree = "<group>"; };
                 FD31604412B026F700C1A359 /* AudioArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioArray.h; sourceTree = "<group>"; };
                 FD31604512B026F700C1A359 /* AudioBus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioBus.cpp; sourceTree = "<group>"; };
                 FD31604612B026F700C1A359 /* AudioBus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBus.h; sourceTree = "<group>"; };
@@ -13920,9 +13920,9 @@
                 FD5686C813AC180200B69C68 /* AsyncAudioDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncAudioDecoder.h; sourceTree = "<group>"; };
                 FD5686CB13AC181400B69C68 /* AudioBufferCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioBufferCallback.h; sourceTree = "<group>"; };
                 FD5686CD13AC183E00B69C68 /* AudioBufferCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioBufferCallback.idl; sourceTree = "<group>"; };
-               FD581FAB1520F91F003A7A75 /* Oscillator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Oscillator.cpp; sourceTree = "<group>"; };
-               FD581FAC1520F91F003A7A75 /* Oscillator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Oscillator.h; sourceTree = "<group>"; };
-               FD581FAD1520F91F003A7A75 /* Oscillator.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Oscillator.idl; sourceTree = "<group>"; };
+               FD581FAB1520F91F003A7A75 /* OscillatorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OscillatorNode.cpp; sourceTree = "<group>"; };
+               FD581FAC1520F91F003A7A75 /* OscillatorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OscillatorNode.h; sourceTree = "<group>"; };
+               FD581FAD1520F91F003A7A75 /* OscillatorNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OscillatorNode.idl; sourceTree = "<group>"; };
                 FD581FB11520F93B003A7A75 /* WaveTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WaveTable.cpp; sourceTree = "<group>"; };
                 FD581FB21520F93B003A7A75 /* WaveTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WaveTable.h; sourceTree = "<group>"; };
                 FD581FB31520F93B003A7A75 /* WaveTable.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WaveTable.idl; sourceTree = "<group>"; };
@@ -13955,42 +13955,42 @@
                 FD82D7F613D4C8BD004E4372 /* JSWaveShaperNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWaveShaperNode.h; sourceTree = "<group>"; };
                 FD8C46E9154608E700A5910C /* AudioScheduledSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioScheduledSourceNode.cpp; sourceTree = "<group>"; };
                 FD8C46EA154608E700A5910C /* AudioScheduledSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioScheduledSourceNode.h; sourceTree = "<group>"; };
+               FDA15EC712B03F50003A583A /* JSAnalyserNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAnalyserNode.cpp; sourceTree = "<group>"; };
+               FDA15EC812B03F50003A583A /* JSAnalyserNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAnalyserNode.h; sourceTree = "<group>"; };
                 FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBuffer.cpp; sourceTree = "<group>"; };
                 FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioBuffer.h; sourceTree = "<group>"; };
                 FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferSourceNode.cpp; sourceTree = "<group>"; };
                 FDA15E8412B03EE1003A583A /* JSAudioBufferSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioBufferSourceNode.h; sourceTree = "<group>"; };
-               FDA15E8512B03EE1003A583A /* JSAudioChannelMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioChannelMerger.cpp; sourceTree = "<group>"; };
-               FDA15E8612B03EE1003A583A /* JSAudioChannelMerger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioChannelMerger.h; sourceTree = "<group>"; };
-               FDA15E8712B03EE1003A583A /* JSAudioChannelSplitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioChannelSplitter.cpp; sourceTree = "<group>"; };
-               FDA15E8812B03EE1003A583A /* JSAudioChannelSplitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioChannelSplitter.h; sourceTree = "<group>"; };
                 FDA15E8912B03EE1003A583A /* JSAudioContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioContext.cpp; sourceTree = "<group>"; };
                 FDA15E8A12B03EE1003A583A /* JSAudioContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioContext.h; sourceTree = "<group>"; };
                 FDA15E8B12B03EE1003A583A /* JSAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioDestinationNode.cpp; sourceTree = "<group>"; };
                 FDA15E8C12B03EE1003A583A /* JSAudioDestinationNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioDestinationNode.h; sourceTree = "<group>"; };
                 FDA15E8D12B03EE1003A583A /* JSAudioGain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioGain.cpp; sourceTree = "<group>"; };
                 FDA15E8E12B03EE1003A583A /* JSAudioGain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioGain.h; sourceTree = "<group>"; };
-               FDA15E8F12B03EE1003A583A /* JSAudioGainNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioGainNode.cpp; sourceTree = "<group>"; };
-               FDA15E9012B03EE1003A583A /* JSAudioGainNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioGainNode.h; sourceTree = "<group>"; };
                 FDA15E9112B03EE1003A583A /* JSAudioListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioListener.cpp; sourceTree = "<group>"; };
                 FDA15E9212B03EE1003A583A /* JSAudioListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioListener.h; sourceTree = "<group>"; };
                 FDA15E9312B03EE1003A583A /* JSAudioNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioNode.cpp; sourceTree = "<group>"; };
                 FDA15E9412B03EE1003A583A /* JSAudioNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioNode.h; sourceTree = "<group>"; };
-               FDA15E9512B03EE1003A583A /* JSAudioPannerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioPannerNode.cpp; sourceTree = "<group>"; };
-               FDA15E9612B03EE1003A583A /* JSAudioPannerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioPannerNode.h; sourceTree = "<group>"; };
                 FDA15E9712B03EE1003A583A /* JSAudioParam.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioParam.cpp; sourceTree = "<group>"; };
                 FDA15E9812B03EE1003A583A /* JSAudioParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioParam.h; sourceTree = "<group>"; };
                 FDA15E9912B03EE1003A583A /* JSAudioProcessingEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioProcessingEvent.cpp; sourceTree = "<group>"; };
                 FDA15E9A12B03EE1003A583A /* JSAudioProcessingEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioProcessingEvent.h; sourceTree = "<group>"; };
                 FDA15E9B12B03EE1003A583A /* JSAudioSourceNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioSourceNode.cpp; sourceTree = "<group>"; };
                 FDA15E9C12B03EE1003A583A /* JSAudioSourceNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioSourceNode.h; sourceTree = "<group>"; };
+               FDA15E8512B03EE1003A583A /* JSChannelMergerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSChannelMergerNode.cpp; sourceTree = "<group>"; };
+               FDA15E8612B03EE1003A583A /* JSChannelMergerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSChannelMergerNode.h; sourceTree = "<group>"; };
+               FDA15E8712B03EE1003A583A /* JSChannelSplitterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSChannelSplitterNode.cpp; sourceTree = "<group>"; };
+               FDA15E8812B03EE1003A583A /* JSChannelSplitterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSChannelSplitterNode.h; sourceTree = "<group>"; };
                 FDA15EBB12B03F0B003A583A /* JSConvolverNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSConvolverNode.cpp; sourceTree = "<group>"; };
                 FDA15EBC12B03F0B003A583A /* JSConvolverNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSConvolverNode.h; sourceTree = "<group>"; };
-               FDA15EC712B03F50003A583A /* JSRealtimeAnalyserNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRealtimeAnalyserNode.cpp; sourceTree = "<group>"; };
-               FDA15EC812B03F50003A583A /* JSRealtimeAnalyserNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRealtimeAnalyserNode.h; sourceTree = "<group>"; };
-               FDA15ECB12B03F61003A583A /* JSJavaScriptAudioNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSJavaScriptAudioNode.cpp; sourceTree = "<group>"; };
-               FDA15ECC12B03F61003A583A /* JSJavaScriptAudioNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSJavaScriptAudioNode.h; sourceTree = "<group>"; };
                 FDA15ECF12B03F94003A583A /* JSDelayNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDelayNode.cpp; sourceTree = "<group>"; };
                 FDA15ED012B03F94003A583A /* JSDelayNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDelayNode.h; sourceTree = "<group>"; };
+               FDA15E8F12B03EE1003A583A /* JSGainNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGainNode.cpp; sourceTree = "<group>"; };
+               FDA15E9012B03EE1003A583A /* JSGainNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGainNode.h; sourceTree = "<group>"; };
+               FDA15E9512B03EE1003A583A /* JSPannerNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPannerNode.cpp; sourceTree = "<group>"; };
+               FDA15E9612B03EE1003A583A /* JSPannerNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPannerNode.h; sourceTree = "<group>"; };
+               FDA15ECB12B03F61003A583A /* JSScriptProcessorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProcessorNode.cpp; sourceTree = "<group>"; };
+               FDA15ECC12B03F61003A583A /* JSScriptProcessorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSScriptProcessorNode.h; sourceTree = "<group>"; };
                 FDA3E955134A49EF008D4B5A /* OfflineAudioCompletionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineAudioCompletionEvent.cpp; sourceTree = "<group>"; };
                 FDA3E956134A49EF008D4B5A /* OfflineAudioCompletionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineAudioCompletionEvent.h; sourceTree = "<group>"; };
                 FDA3E957134A49EF008D4B5A /* OfflineAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineAudioDestinationNode.cpp; sourceTree = "<group>"; };
@@ -14008,17 +14008,17 @@
                 FDC54F021399B0DA008D9117 /* BiquadFilterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BiquadFilterNode.h; sourceTree = "<group>"; };
                 FDC54F031399B0DA008D9117 /* BiquadFilterNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BiquadFilterNode.idl; sourceTree = "<group>"; };
                 FDE2D55A159E66EB00DCCCF8 /* AudioIOCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioIOCallback.h; sourceTree = "<group>"; };
-               FDEA6240152102E200479DF0 /* JSOscillator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOscillator.cpp; sourceTree = "<group>"; };
-               FDEA6241152102E200479DF0 /* JSOscillator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOscillator.h; sourceTree = "<group>"; };
+               FDEA6240152102E200479DF0 /* JSOscillatorNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOscillatorNode.cpp; sourceTree = "<group>"; };
+               FDEA6241152102E200479DF0 /* JSOscillatorNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOscillatorNode.h; sourceTree = "<group>"; };
                 FDEA6244152102FC00479DF0 /* JSWaveTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWaveTable.cpp; sourceTree = "<group>"; };
                 FDEA6245152102FC00479DF0 /* JSWaveTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWaveTable.h; sourceTree = "<group>"; };
                 FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferSourceNodeCustom.cpp; sourceTree = "<group>"; };
                 FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioContextCustom.cpp; sourceTree = "<group>"; };
-               FDEAAAFD12B02F4900DCF33B /* JSJavaScriptAudioNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSJavaScriptAudioNodeCustom.cpp; sourceTree = "<group>"; };
                 FDF09DC61399B62200688E5B /* JSBiquadFilterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBiquadFilterNode.cpp; sourceTree = "<group>"; };
                 FDF09DC71399B62200688E5B /* JSBiquadFilterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBiquadFilterNode.h; sourceTree = "<group>"; };
                 FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOfflineAudioCompletionEvent.cpp; sourceTree = "<group>"; };
                 FDF6BAF7134A4C9800822920 /* JSOfflineAudioCompletionEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOfflineAudioCompletionEvent.h; sourceTree = "<group>"; };
+               FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProcessorNodeCustom.cpp; sourceTree = "<group>"; };
                 FDF7E9C113AC21DB00A51EAC /* JSAudioBufferCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferCallback.cpp; sourceTree = "<group>"; };
                 FDF7E9C213AC21DB00A51EAC /* JSAudioBufferCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioBufferCallback.h; sourceTree = "<group>"; };
                 FE6FD4850F676E5700092873 /* Coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Coordinates.h; sourceTree = "<group>"; };
@@ -14626,8 +14626,8 @@
                 1C5FAECA0DCFD8C900D58F78 /* Inspector */ = {
                         isa = PBXGroup;
                         children = (
-                               7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
                                 AA912750157E35A500454E54 /* InjectedScriptCanvasModuleSource.h */,
+                               7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
                                 4F707A9711EF679400ACDA69 /* InspectorBackendDispatcher.cpp */,
                                 4F707A9811EF679400ACDA69 /* InspectorBackendDispatcher.h */,
                                 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
@@ -14667,6 +14667,9 @@
                                 F3644AFE1119805900E0D537 /* InjectedScript.h */,
                                 AAB6054A15874C58007B5031 /* InjectedScriptBase.cpp */,
                                 AAB6054B15874C58007B5031 /* InjectedScriptBase.h */,
+                               AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */,
+                               AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */,
+                               AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */,
                                 7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,
                                 7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */,
                                 7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,
@@ -14675,9 +14678,6 @@
                                 AAB6054C15874C58007B5031 /* InjectedScriptModule.cpp */,
                                 AAB6054D15874C58007B5031 /* InjectedScriptModule.h */,
                                 7A563F9512DF5C9100F4536D /* InjectedScriptSource.js */,
-                               AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */,
-                               AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */,
-                               AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */,
                                 1C435CD414E8545B004E10EA /* Inspector-0.1.json */,
                                 1C435CD514E8545B004E10EA /* Inspector-1.0.json */,
                                 1C435CD314E8544F004E10EA /* Inspector.json */,
@@ -14687,6 +14687,9 @@
                                 B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
                                 7AA51B6D1483B61600AD2752 /* InspectorBaseAgent.cpp */,
                                 7AA51B6C1483B61600AD2752 /* InspectorBaseAgent.h */,
+                               AAD766E8157E502F00E85423 /* InspectorCanvasAgent.cpp */,
+                               AAD766E9157E502F00E85423 /* InspectorCanvasAgent.h */,
+                               AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */,
                                 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
                                 1C81B9580E97330800266E07 /* InspectorClient.h */,
                                 F3335BF612E07DC300D33011 /* InspectorConsoleAgent.cpp */,
@@ -14752,9 +14755,6 @@
                                 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */,
                                 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */,
                                 4F3289B411A42AAB005ABE7E /* InspectorValues.h */,
-                               AAD766E8157E502F00E85423 /* InspectorCanvasAgent.cpp */,
-                               AAD766E9157E502F00E85423 /* InspectorCanvasAgent.h */,
-                               AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */,
                                 F3810C191365A49600ED6E33 /* InspectorWorkerAgent.cpp */,
                                 F3810C1A1365A49600ED6E33 /* InspectorWorkerAgent.h */,
                                 F375CC061150D300008DDB81 /* InspectorWorkerResource.h */,
@@ -15815,9 +15815,9 @@
                                 E0FEF371B27C53EAC1C1FBEE /* EventSource.cpp */,
                                 E0FEF371B17C53EAC1C1FBEE /* EventSource.h */,
                                 E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */,
-                               14993BE30B2F2B1C0050497F /* FocusController.cpp */,
                                 97C740121603F7A10011FF2D /* FeatureObserver.cpp */,
                                 97C740131603F7A10011FF2D /* FeatureObserver.h */,
+                               14993BE30B2F2B1C0050497F /* FocusController.cpp */,
                                 14993BE40B2F2B1C0050497F /* FocusController.h */,
                                 062287830B4DB322000C34DF /* FocusDirection.h */,
                                 65BF02290974816300C43196 /* Frame.cpp */,
@@ -17367,7 +17367,6 @@
                                 F55B3D7D1251F12D003EF269 /* CheckboxInputType.cpp */,
                                 F55B3D7E1251F12D003EF269 /* CheckboxInputType.h */,
                                 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */,
-                               CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */,
                                 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */,
                                 93C441FF0F813AE100C1A634 /* CollectionType.h */,
                                 F55B3D7F1251F12D003EF269 /* ColorInputType.cpp */,
@@ -17684,9 +17683,12 @@
                                 E446139C0CD6331000FADA75 /* MediaError.idl */,
                                 07A6D1E91491137700051D0C /* MediaFragmentURIParser.cpp */,
                                 07A6D1EA1491137700051D0C /* MediaFragmentURIParser.h */,
-                               9B2F7CF714562120007F8B50 /* MicroDataItemValue.cpp */,
                                 CDB859F2160D489900E5B07F /* MediaKeyError.h */,
+                               CDB859F3160D489900E5B07F /* MediaKeyError.idl */,
+                               CDB859F4160D489900E5B07F /* MediaKeyEvent.cpp */,
                                 CDB859F5160D489900E5B07F /* MediaKeyEvent.h */,
+                               CDB859F6160D489900E5B07F /* MediaKeyEvent.idl */,
+                               9B2F7CF714562120007F8B50 /* MicroDataItemValue.cpp */,
                                 9B2F7CF814562120007F8B50 /* MicroDataItemValue.h */,
                                 1059457115B428C3004D37FD /* MicroDataItemValue.idl */,
                                 F55B3D911251F12D003EF269 /* MonthInputType.cpp */,
@@ -17738,8 +17740,6 @@
                                 E44613A00CD6331000FADA75 /* VoidCallback.idl */,
                                 F55B3DAB1251F12D003EF269 /* WeekInputType.cpp */,
                                 F55B3DAC1251F12D003EF269 /* WeekInputType.h */,
-                               CDB859F3160D489900E5B07F /* MediaKeyError.idl */,
-                               CDB859F6160D489900E5B07F /* MediaKeyEvent.idl */,
                         );
                         path = html;
                         sourceTree = "<group>";
@@ -18281,10 +18281,6 @@
                 A83B79080CCAFF2B000B0825 /* HTML */ = {
                         isa = PBXGroup;
                         children = (
-                               CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */,
-                               CDB859F9160D493E00E5B07F /* JSMediaKeyEvent.h */,
-                               CDB859F0160D42DD00E5B07F /* JSMediaKeyError.cpp */,
-                               CDB859F1160D42DD00E5B07F /* JSMediaKeyError.h */,
                                 49EECEF2105070C400099FAB /* JSArrayBuffer.cpp */,
                                 49EECEF3105070C400099FAB /* JSArrayBuffer.h */,
                                 49EECF19105072F300099FAB /* JSArrayBufferView.cpp */,
@@ -18477,6 +18473,10 @@
                                 CD27F6E3145767580078207D /* JSMediaController.h */,
                                 E44614100CD6826900FADA75 /* JSMediaError.cpp */,
                                 E44614110CD6826900FADA75 /* JSMediaError.h */,
+                               CDB859F0160D42DD00E5B07F /* JSMediaKeyError.cpp */,
+                               CDB859F1160D42DD00E5B07F /* JSMediaKeyError.h */,
+                               CDB859F8160D493E00E5B07F /* JSMediaKeyEvent.cpp */,
+                               CDB859F9160D493E00E5B07F /* JSMediaKeyEvent.h */,
                                 1059457515B42A0D004D37FD /* JSMicroDataItemValue.cpp */,
                                 1059457915B42A43004D37FD /* JSMicroDataItemValue.h */,
                                 9001787E12E0370700648462 /* JSOESStandardDerivatives.cpp */,
@@ -19968,6 +19968,7 @@
                                 E134F5AA12EE343F004EC58D /* IntRectHash.h */,
                                 B27535470B053814002CE64F /* IntSize.h */,
                                 B27535480B053814002CE64F /* IntSizeHash.h */,
+                               65CC6BED16014EC0000ED27D /* Latin1TextIterator.h */,
                                 E4B41E0C0CBF90BD00AF2ECE /* MediaPlayer.cpp */,
                                 E4B41E0D0CBF90BD00AF2ECE /* MediaPlayer.h */,
                                 079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */,
@@ -19992,7 +19993,6 @@
                                 B23540F00D00782E002382FA /* StringTruncator.cpp */,
                                 B23540F10D00782E002382FA /* StringTruncator.h */,
                                 087558C313B4A57D00F49307 /* SurrogatePairAwareTextIterator.cpp */,
-                               65CC6BED16014EC0000ED27D /* Latin1TextIterator.h */,
                                 087558C413B4A57D00F49307 /* SurrogatePairAwareTextIterator.h */,
                                 087E0AF413606D0B00FA4BA8 /* SVGGlyph.cpp */,
                                 087E0AF513606D0B00FA4BA8 /* SVGGlyph.h */,
@@ -20416,7 +20416,6 @@
                                 7A0E76D410BF050700A0276E /* JSInjectedScriptHostCustom.cpp */,
                                 F316396D1329487600A649CB /* JSInjectedScriptManager.cpp */,
                                 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */,
-                               FDEAAAFD12B02F4900DCF33B /* JSJavaScriptAudioNodeCustom.cpp */,
                                 1C5FAEE60DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp */,
                                 BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */,
                                 1464E06B135EC10600FDB00A /* JSMediaListCustom.cpp */,
@@ -20438,6 +20437,7 @@
                                 A85F22081430377D007CC884 /* JSPopStateEventCustom.cpp */,
                                 E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */,
                                 4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */,
+                               FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */,
                                 9FA37EE61172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp */,
                                 51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */,
                                 1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */,
@@ -21473,6 +21473,8 @@
                                 0F580CF90F12DE9B0051D689 /* RenderLayerCompositor.h */,
                                 50D10D971545F5760096D288 /* RenderLayerFilterInfo.cpp */,
                                 50D10D981545F5760096D288 /* RenderLayerFilterInfo.h */,
+                               3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */,
+                               3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */,
                                 BC33FB1A0F30EE85002CDD7C /* RenderLineBoxList.cpp */,
                                 0BE030A10F3112FB003C1A46 /* RenderLineBoxList.h */,
                                 ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */,
@@ -21567,8 +21569,6 @@
                                 BCEA484B097D93020094C9E4 /* RenderTheme.h */,
                                 BCEA4848097D93020094C9E4 /* RenderThemeMac.h */,
                                 BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */,
-                               3C244FE5A375AC633F88BE6F /* RenderLayerModelObject.cpp */,
-                               3C244FE4A375AC633F88BE6F /* RenderLayerModelObject.h */,
                                 93955A4203D72932008635CE /* RenderTreeAsText.cpp */,
                                 93955A4103D72932008635CE /* RenderTreeAsText.h */,
                                 E4B41E330CBFB60900AF2ECE /* RenderVideo.cpp */,
@@ -22012,6 +22012,9 @@
                 FD315FA212B025B100C1A359 /* webaudio */ = {
                         isa = PBXGroup;
                         children = (
+                               FD315FF312B0267600C1A359 /* AnalyserNode.cpp */,
+                               FD315FF412B0267600C1A359 /* AnalyserNode.h */,
+                               FD315FF512B0267600C1A359 /* AnalyserNode.idl */,
                                 FD5686C713AC180200B69C68 /* AsyncAudioDecoder.cpp */,
                                 FD5686C813AC180200B69C68 /* AsyncAudioDecoder.h */,
                                 FD629EA2154B47160006D026 /* AudioBasicInspectorNode.cpp */,
@@ -22026,12 +22029,6 @@
                                 FD315FB112B0267500C1A359 /* AudioBufferSourceNode.cpp */,
                                 FD315FB212B0267500C1A359 /* AudioBufferSourceNode.h */,
                                 FD315FB312B0267500C1A359 /* AudioBufferSourceNode.idl */,
-                               FD315FB412B0267500C1A359 /* AudioChannelMerger.cpp */,
-                               FD315FB512B0267500C1A359 /* AudioChannelMerger.h */,
-                               FD315FB612B0267500C1A359 /* AudioChannelMerger.idl */,
-                               FD315FB712B0267500C1A359 /* AudioChannelSplitter.cpp */,
-                               FD315FB812B0267500C1A359 /* AudioChannelSplitter.h */,
-                               FD315FB912B0267500C1A359 /* AudioChannelSplitter.idl */,
                                 FD315FBA12B0267500C1A359 /* AudioContext.cpp */,
                                 FD315FBB12B0267500C1A359 /* AudioContext.h */,
                                 FD315FBC12B0267500C1A359 /* AudioContext.idl */,
@@ -22040,9 +22037,6 @@
                                 FD315FBF12B0267500C1A359 /* AudioDestinationNode.idl */,
                                 FD315FC012B0267500C1A359 /* AudioGain.h */,
                                 FD315FC112B0267500C1A359 /* AudioGain.idl */,
-                               FD315FC212B0267500C1A359 /* AudioGainNode.cpp */,
-                               FD315FC312B0267500C1A359 /* AudioGainNode.h */,
-                               FD315FC412B0267500C1A359 /* AudioGainNode.idl */,
                                 FD315FC512B0267500C1A359 /* AudioListener.cpp */,
                                 FD315FC612B0267500C1A359 /* AudioListener.h */,
                                 FD315FC712B0267500C1A359 /* AudioListener.idl */,
@@ -22053,9 +22047,6 @@
                                 FD315FCC12B0267500C1A359 /* AudioNodeInput.h */,
                                 FD315FCD12B0267500C1A359 /* AudioNodeOutput.cpp */,
                                 FD315FCE12B0267500C1A359 /* AudioNodeOutput.h */,
-                               FD315FCF12B0267500C1A359 /* AudioPannerNode.cpp */,
-                               FD315FD012B0267500C1A359 /* AudioPannerNode.h */,
-                               FD315FD112B0267500C1A359 /* AudioPannerNode.idl */,
                                 FD315FD212B0267500C1A359 /* AudioParam.cpp */,
                                 FD315FD312B0267500C1A359 /* AudioParam.h */,
                                 FD315FD412B0267500C1A359 /* AudioParam.idl */,
@@ -22077,6 +22068,12 @@
                                 FDC54F031399B0DA008D9117 /* BiquadFilterNode.idl */,
                                 FD315FDC12B0267600C1A359 /* BiquadProcessor.cpp */,
                                 FD315FDD12B0267600C1A359 /* BiquadProcessor.h */,
+                               FD315FB412B0267500C1A359 /* ChannelMergerNode.cpp */,
+                               FD315FB512B0267500C1A359 /* ChannelMergerNode.h */,
+                               FD315FB612B0267500C1A359 /* ChannelMergerNode.idl */,
+                               FD315FB712B0267500C1A359 /* ChannelSplitterNode.cpp */,
+                               FD315FB812B0267500C1A359 /* ChannelSplitterNode.h */,
+                               FD315FB912B0267500C1A359 /* ChannelSplitterNode.idl */,
                                 FD315FDE12B0267600C1A359 /* ConvolverNode.cpp */,
                                 FD315FDF12B0267600C1A359 /* ConvolverNode.h */,
                                 FD315FE012B0267600C1A359 /* ConvolverNode.idl */,
@@ -22092,9 +22089,9 @@
                                 FD6ED2C1136B8E42003CF072 /* DynamicsCompressorNode.cpp */,
                                 FD6ED2C2136B8E42003CF072 /* DynamicsCompressorNode.h */,
                                 FD6ED2C9136B8E9D003CF072 /* DynamicsCompressorNode.idl */,
-                               FD315FEB12B0267600C1A359 /* JavaScriptAudioNode.cpp */,
-                               FD315FEC12B0267600C1A359 /* JavaScriptAudioNode.h */,
-                               FD315FED12B0267600C1A359 /* JavaScriptAudioNode.idl */,
+                               FD315FC212B0267500C1A359 /* GainNode.cpp */,
+                               FD315FC312B0267500C1A359 /* GainNode.h */,
+                               FD315FC412B0267500C1A359 /* GainNode.idl */,
                                 FD6F252913F5EF0E0065165F /* MediaElementAudioSourceNode.cpp */,
                                 FD6F252A13F5EF0E0065165F /* MediaElementAudioSourceNode.h */,
                                 FD6F252B13F5EF0E0065165F /* MediaElementAudioSourceNode.idl */,
@@ -22106,14 +22103,17 @@
                                 FDA3E95D134A49FF008D4B5A /* OfflineAudioCompletionEvent.idl */,
                                 FDA3E957134A49EF008D4B5A /* OfflineAudioDestinationNode.cpp */,
                                 FDA3E958134A49EF008D4B5A /* OfflineAudioDestinationNode.h */,
-                               FD581FAB1520F91F003A7A75 /* Oscillator.cpp */,
-                               FD581FAC1520F91F003A7A75 /* Oscillator.h */,
-                               FD581FAD1520F91F003A7A75 /* Oscillator.idl */,
+                               FD581FAB1520F91F003A7A75 /* OscillatorNode.cpp */,
+                               FD581FAC1520F91F003A7A75 /* OscillatorNode.h */,
+                               FD581FAD1520F91F003A7A75 /* OscillatorNode.idl */,
+                               FD315FCF12B0267500C1A359 /* PannerNode.cpp */,
+                               FD315FD012B0267500C1A359 /* PannerNode.h */,
+                               FD315FD112B0267500C1A359 /* PannerNode.idl */,
                                 FD315FF112B0267600C1A359 /* RealtimeAnalyser.cpp */,
                                 FD315FF212B0267600C1A359 /* RealtimeAnalyser.h */,
-                               FD315FF312B0267600C1A359 /* RealtimeAnalyserNode.cpp */,
-                               FD315FF412B0267600C1A359 /* RealtimeAnalyserNode.h */,
-                               FD315FF512B0267600C1A359 /* RealtimeAnalyserNode.idl */,
+                               FD315FEB12B0267600C1A359 /* ScriptProcessorNode.cpp */,
+                               FD315FEC12B0267600C1A359 /* ScriptProcessorNode.h */,
+                               FD315FED12B0267600C1A359 /* ScriptProcessorNode.idl */,
                                 FD7F298A13D4C0CB00AD9535 /* WaveShaperDSPKernel.cpp */,
                                 FD7F298B13D4C0CB00AD9535 /* WaveShaperDSPKernel.h */,
                                 FD7F298C13D4C0CB00AD9535 /* WaveShaperNode.cpp */,
@@ -22222,30 +22222,24 @@
                 FDA15E7B12B03E04003A583A /* WebAudio */ = {
                         isa = PBXGroup;
                         children = (
+                               FDA15EC712B03F50003A583A /* JSAnalyserNode.cpp */,
+                               FDA15EC812B03F50003A583A /* JSAnalyserNode.h */,
                                 FDA15E8112B03EE1003A583A /* JSAudioBuffer.cpp */,
                                 FDA15E8212B03EE1003A583A /* JSAudioBuffer.h */,
                                 FDF7E9C113AC21DB00A51EAC /* JSAudioBufferCallback.cpp */,
                                 FDF7E9C213AC21DB00A51EAC /* JSAudioBufferCallback.h */,
                                 FDA15E8312B03EE1003A583A /* JSAudioBufferSourceNode.cpp */,
                                 FDA15E8412B03EE1003A583A /* JSAudioBufferSourceNode.h */,
-                               FDA15E8512B03EE1003A583A /* JSAudioChannelMerger.cpp */,
-                               FDA15E8612B03EE1003A583A /* JSAudioChannelMerger.h */,
-                               FDA15E8712B03EE1003A583A /* JSAudioChannelSplitter.cpp */,
-                               FDA15E8812B03EE1003A583A /* JSAudioChannelSplitter.h */,
                                 FDA15E8912B03EE1003A583A /* JSAudioContext.cpp */,
                                 FDA15E8A12B03EE1003A583A /* JSAudioContext.h */,
                                 FDA15E8B12B03EE1003A583A /* JSAudioDestinationNode.cpp */,
                                 FDA15E8C12B03EE1003A583A /* JSAudioDestinationNode.h */,
                                 FDA15E8D12B03EE1003A583A /* JSAudioGain.cpp */,
                                 FDA15E8E12B03EE1003A583A /* JSAudioGain.h */,
-                               FDA15E8F12B03EE1003A583A /* JSAudioGainNode.cpp */,
-                               FDA15E9012B03EE1003A583A /* JSAudioGainNode.h */,
                                 FDA15E9112B03EE1003A583A /* JSAudioListener.cpp */,
                                 FDA15E9212B03EE1003A583A /* JSAudioListener.h */,
                                 FDA15E9312B03EE1003A583A /* JSAudioNode.cpp */,
                                 FDA15E9412B03EE1003A583A /* JSAudioNode.h */,
-                               FDA15E9512B03EE1003A583A /* JSAudioPannerNode.cpp */,
-                               FDA15E9612B03EE1003A583A /* JSAudioPannerNode.h */,
                                 FDA15E9712B03EE1003A583A /* JSAudioParam.cpp */,
                                 FDA15E9812B03EE1003A583A /* JSAudioParam.h */,
                                 FDA15E9912B03EE1003A583A /* JSAudioProcessingEvent.cpp */,
@@ -22254,24 +22248,30 @@
                                 FDA15E9C12B03EE1003A583A /* JSAudioSourceNode.h */,
                                 FDF09DC61399B62200688E5B /* JSBiquadFilterNode.cpp */,
                                 FDF09DC71399B62200688E5B /* JSBiquadFilterNode.h */,
+                               FDA15E8512B03EE1003A583A /* JSChannelMergerNode.cpp */,
+                               FDA15E8612B03EE1003A583A /* JSChannelMergerNode.h */,
+                               FDA15E8712B03EE1003A583A /* JSChannelSplitterNode.cpp */,
+                               FDA15E8812B03EE1003A583A /* JSChannelSplitterNode.h */,
                                 FDA15EBB12B03F0B003A583A /* JSConvolverNode.cpp */,
                                 FDA15EBC12B03F0B003A583A /* JSConvolverNode.h */,
                                 FDA15ECF12B03F94003A583A /* JSDelayNode.cpp */,
                                 FDA15ED012B03F94003A583A /* JSDelayNode.h */,
                                 FD7868B7136B999200D403DF /* JSDynamicsCompressorNode.cpp */,
                                 FD7868B8136B999200D403DF /* JSDynamicsCompressorNode.h */,
-                               FDA15ECB12B03F61003A583A /* JSJavaScriptAudioNode.cpp */,
-                               FDA15ECC12B03F61003A583A /* JSJavaScriptAudioNode.h */,
+                               FDA15E8F12B03EE1003A583A /* JSGainNode.cpp */,
+                               FDA15E9012B03EE1003A583A /* JSGainNode.h */,
                                 FD23A12313F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp */,
                                 FD23A12413F5FA5900F67001 /* JSMediaElementAudioSourceNode.h */,
                                 FDBD480A159BC6870093EB4F /* JSMediaStreamAudioSourceNode.cpp */,
                                 FDBD480B159BC6870093EB4F /* JSMediaStreamAudioSourceNode.h */,
                                 FDF6BAF6134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp */,
                                 FDF6BAF7134A4C9800822920 /* JSOfflineAudioCompletionEvent.h */,
-                               FDEA6240152102E200479DF0 /* JSOscillator.cpp */,
-                               FDEA6241152102E200479DF0 /* JSOscillator.h */,
-                               FDA15EC712B03F50003A583A /* JSRealtimeAnalyserNode.cpp */,
-                               FDA15EC812B03F50003A583A /* JSRealtimeAnalyserNode.h */,
+                               FDEA6240152102E200479DF0 /* JSOscillatorNode.cpp */,
+                               FDEA6241152102E200479DF0 /* JSOscillatorNode.h */,
+                               FDA15E9512B03EE1003A583A /* JSPannerNode.cpp */,
+                               FDA15E9612B03EE1003A583A /* JSPannerNode.h */,
+                               FDA15ECB12B03F61003A583A /* JSScriptProcessorNode.cpp */,
+                               FDA15ECC12B03F61003A583A /* JSScriptProcessorNode.h */,
                                 FD82D7F513D4C8BD004E4372 /* JSWaveShaperNode.cpp */,
                                 FD82D7F613D4C8BD004E4372 /* JSWaveShaperNode.h */,
                                 FDEA6244152102FC00479DF0 /* JSWaveTable.cpp */,
@@ -22300,8 +22300,6 @@
                         isa = PBXHeadersBuildPhase;
                         buildActionMask = 2147483647;
                         files = (
-                               4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */,
-                               E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */,
                                 97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */,
                                 41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
                                 29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
@@ -22334,6 +22332,7 @@
                                 CEDA12D7152CA1CB00D9E08D /* AlternativeTextClient.h in Headers */,
                                 CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */,
                                 CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */,
+                               FD31603E12B0267600C1A359 /* AnalyserNode.h in Headers */,
                                 490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
                                 49E912AB0EFAC906009D0CAF /* Animation.h in Headers */,
                                 316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */,
@@ -22372,8 +22371,6 @@
                                 FD315FFC12B0267600C1A359 /* AudioBufferSourceNode.h in Headers */,
                                 FD31607C12B026F700C1A359 /* AudioBus.h in Headers */,
                                 FD31607E12B026F700C1A359 /* AudioChannel.h in Headers */,
-                               FD315FFF12B0267600C1A359 /* AudioChannelMerger.h in Headers */,
-                               FD31600212B0267600C1A359 /* AudioChannelSplitter.h in Headers */,
                                 FD31600512B0267600C1A359 /* AudioContext.h in Headers */,
                                 FD31607F12B026F700C1A359 /* AudioDestination.h in Headers */,
                                 FD3160BD12B0272A00C1A359 /* AudioDestinationMac.h in Headers */,
@@ -22383,13 +22380,11 @@
                                 FD31608312B026F700C1A359 /* AudioFileReader.h in Headers */,
                                 FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */,
                                 FD31600A12B0267600C1A359 /* AudioGain.h in Headers */,
-                               FD31600D12B0267600C1A359 /* AudioGainNode.h in Headers */,
                                 FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */,
                                 FD31601012B0267600C1A359 /* AudioListener.h in Headers */,
                                 FD31601312B0267600C1A359 /* AudioNode.h in Headers */,
                                 FD31601612B0267600C1A359 /* AudioNodeInput.h in Headers */,
                                 FD31601812B0267600C1A359 /* AudioNodeOutput.h in Headers */,
-                               FD31601A12B0267600C1A359 /* AudioPannerNode.h in Headers */,
                                 FD31601D12B0267600C1A359 /* AudioParam.h in Headers */,
                                 FD359190138DB22000E1EBEC /* AudioParamTimeline.h in Headers */,
                                 FD31602012B0267600C1A359 /* AudioProcessingEvent.h in Headers */,
@@ -22488,6 +22483,8 @@
                                 49484FCE102CF23C00187DD3 /* CanvasStyle.h in Headers */,
                                 6550B69E099DF0270090D781 /* CDATASection.h in Headers */,
                                 97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */,
+                               FD315FFF12B0267600C1A359 /* ChannelMergerNode.h in Headers */,
+                               FD31600212B0267600C1A359 /* ChannelSplitterNode.h in Headers */,
                                 6550B6A0099DF0270090D781 /* CharacterData.h in Headers */,
                                 00022E6913CE1BBA00282D5B /* CharacterReferenceParserInlineMethods.h in Headers */,
                                 B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */,
@@ -22506,6 +22503,7 @@
                                 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
                                 85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
                                 93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
+                               FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
                                 97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
                                 C0C054CB1118C8E400CE2636 /* CodeGenerator.pm in Headers */,
                                 BC5EB5DF0E81B9AB00B25965 /* CollapsedBorderValue.h in Headers */,
@@ -22664,10 +22662,10 @@
                                 45861C8216194A7400010F3A /* DateTimeFieldElement.h in Headers */,
                                 45861C8416194A7400010F3A /* DateTimeFieldElements.h in Headers */,
                                 453EB637159C570400001BB7 /* DateTimeFormat.h in Headers */,
-                               45861C8616194A7400010F3A /* DateTimeNumericFieldElement.h in Headers */,
-                               45861C8816194A7400010F3A /* DateTimeSymbolicFieldElement.h in Headers */,
                                 F55B3DB81251F12D003EF269 /* DateTimeInputType.h in Headers */,
                                 F55B3DBA1251F12D003EF269 /* DateTimeLocalInputType.h in Headers */,
+                               45861C8616194A7400010F3A /* DateTimeNumericFieldElement.h in Headers */,
+                               45861C8816194A7400010F3A /* DateTimeSymbolicFieldElement.h in Headers */,
                                 45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */,
                                 A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
                                 CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */,
@@ -22716,6 +22714,7 @@
                                 CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */,
                                 14947FFE12F80CD200A0F631 /* DocumentOrderedMap.h in Headers */,
                                 BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
+                               E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */,
                                 0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */,
                                 86D982F7125C154000AD9E3D /* DocumentTiming.h in Headers */,
                                 A8185F3909765766005826D9 /* DocumentType.h in Headers */,
@@ -23416,6 +23415,7 @@
                                 9767CE0B145ABC13005E64DB /* ExceptionHeaders.h in Headers */,
                                 9767CE0C145ABC13005E64DB /* ExceptionInterfaces.h in Headers */,
                                 6E8798BB15F81E4A00BFE4AA /* ExclusionInterval.h in Headers */,
+                               6EAF34101613869A00859625 /* ExclusionPolygon.h in Headers */,
                                 6E8798BD15F81E4A00BFE4AA /* ExclusionRectangle.h in Headers */,
                                 6E8798BF15F81E4A00BFE4AA /* ExclusionShape.h in Headers */,
                                 FD748AC015BF74ED0059CF0D /* ExclusionShapeInsideInfo.h in Headers */,
@@ -23423,6 +23423,7 @@
                                 6E67D2A71280E8A4008758F7 /* Extensions3DOpenGL.h in Headers */,
                                 44DAB5B215A623580097C1E4 /* Extensions3DOpenGLCommon.h in Headers */,
                                 7728694F14F8882500F484DC /* EXTTextureFilterAnisotropic.h in Headers */,
+                               97C740151603F7A10011FF2D /* FeatureObserver.h in Headers */,
                                 A75E8B890E1DE2D6007F2481 /* FEBlend.h in Headers */,
                                 A75E8B8B0E1DE2D6007F2481 /* FEColorMatrix.h in Headers */,
                                 A75E8B8D0E1DE2D6007F2481 /* FEComponentTransfer.h in Headers */,
@@ -23446,7 +23447,6 @@
                                 84730D8D1248F0B300D3A9C9 /* FETurbulence.h in Headers */,
                                 FD31609512B026F700C1A359 /* FFTConvolver.h in Headers */,
                                 FD31609712B026F700C1A359 /* FFTFrame.h in Headers */,
-                               97C740151603F7A10011FF2D /* FeatureObserver.h in Headers */,
                                 976D6C81122B8A3D001FD1F7 /* File.h in Headers */,
                                 893C47A71238908B002B3D86 /* FileCallback.h in Headers */,
                                 066C772B0AB603B700238CC4 /* FileChooser.h in Headers */,
@@ -23545,6 +23545,7 @@
                                 65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
                                 97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */,
                                 51C81B8A0C4422F70019ECE3 /* FTPDirectoryParser.h in Headers */,
+                               FD31600D12B0267600C1A359 /* GainNode.h in Headers */,
                                 935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */,
                                 1432E8470C51493800B1500F /* GCController.h in Headers */,
                                 C0C054CC1118C8E400CE2636 /* generate-bindings.pl in Headers */,
@@ -23574,6 +23575,7 @@
                                 0F580B0D0F12A2690051D689 /* GraphicsLayer.h in Headers */,
                                 499B3ED7128CD31400E726C2 /* GraphicsLayerCA.h in Headers */,
                                 0F580B0E0F12A2690051D689 /* GraphicsLayerClient.h in Headers */,
+                               1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */,
                                 B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */,
                                 77A17A7B12F2890B004E02F6 /* GraphicsTypes3D.h in Headers */,
                                 C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
@@ -23787,10 +23789,10 @@
                                 DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
                                 F3644B001119805900E0D537 /* InjectedScript.h in Headers */,
                                 AAB6054F15874C58007B5031 /* InjectedScriptBase.h in Headers */,
+                               AA73183F159255B900A93E6E /* InjectedScriptCanvasModule.h in Headers */,
                                 7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */,
                                 F316396C1329481A00A649CB /* InjectedScriptManager.h in Headers */,
                                 AAB6055115874C58007B5031 /* InjectedScriptModule.h in Headers */,
-                               AA73183F159255B900A93E6E /* InjectedScriptCanvasModule.h in Headers */,
                                 A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */,
                                 A8CFF5E30A155A05000A4234 /* InlineFlowBox.h in Headers */,
                                 BCE789161120D6080060ECE5 /* InlineIterator.h in Headers */,
@@ -23808,6 +23810,8 @@
                                 B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
                                 4F707A9A11EF679400ACDA69 /* InspectorBackendDispatcher.h in Headers */,
                                 7AA51B6E1483B61600AD2752 /* InspectorBaseAgent.h in Headers */,
+                               AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */,
+                               AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */,
                                 1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
                                 F3335BF912E07DC300D33011 /* InspectorConsoleAgent.h in Headers */,
                                 F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */,
@@ -23843,8 +23847,6 @@
                                 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                 578DA20F1520EBA3006141C1 /* InspectorTypeBuilder.h in Headers */,
                                 4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */,
-                               AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */,
-                               AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */,
                                 F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
                                 F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
                                 F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
@@ -23854,9 +23856,9 @@
                                 E134F5AB12EE343F004EC58D /* IntRectHash.h in Headers */,
                                 B27535750B053814002CE64F /* IntSize.h in Headers */,
                                 B27535760B053814002CE64F /* IntSizeHash.h in Headers */,
-                               FD31603612B0267600C1A359 /* JavaScriptAudioNode.h in Headers */,
                                 1C81BA0A0E97348300266E07 /* JavaScriptCallFrame.h in Headers */,
                                 418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
+                               FDA15ECA12B03F50003A583A /* JSAnalyserNode.h in Headers */,
                                 49EECF01105070C400099FAB /* JSArrayBuffer.h in Headers */,
                                 49EECF1C105072F300099FAB /* JSArrayBufferView.h in Headers */,
                                 86243D0111BC31F700CC006A /* JSArrayBufferViewHelper.h in Headers */,
@@ -23864,15 +23866,11 @@
                                 FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */,
                                 FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */,
                                 FDA15EA012B03EE1003A583A /* JSAudioBufferSourceNode.h in Headers */,
-                               FDA15EA212B03EE1003A583A /* JSAudioChannelMerger.h in Headers */,
-                               FDA15EA412B03EE1003A583A /* JSAudioChannelSplitter.h in Headers */,
                                 FDA15EA612B03EE1003A583A /* JSAudioContext.h in Headers */,
                                 FDA15EA812B03EE1003A583A /* JSAudioDestinationNode.h in Headers */,
                                 FDA15EAA12B03EE1003A583A /* JSAudioGain.h in Headers */,
-                               FDA15EAC12B03EE1003A583A /* JSAudioGainNode.h in Headers */,
                                 FDA15EAE12B03EE1003A583A /* JSAudioListener.h in Headers */,
                                 FDA15EB012B03EE1003A583A /* JSAudioNode.h in Headers */,
-                               FDA15EB212B03EE1003A583A /* JSAudioPannerNode.h in Headers */,
                                 FDA15EB412B03EE1003A583A /* JSAudioParam.h in Headers */,
                                 FDA15EB612B03EE1003A583A /* JSAudioProcessingEvent.h in Headers */,
                                 FDA15EB812B03EE1003A583A /* JSAudioSourceNode.h in Headers */,
@@ -23886,6 +23884,8 @@
                                 49EED1431051969400099FAB /* JSCanvasRenderingContext.h in Headers */,
                                 49EED1451051969400099FAB /* JSCanvasRenderingContext2D.h in Headers */,
                                 93F9B7A10BA6032600854064 /* JSCDATASection.h in Headers */,
+                               FDA15EA212B03EE1003A583A /* JSChannelMergerNode.h in Headers */,
+                               FDA15EA412B03EE1003A583A /* JSChannelSplitterNode.h in Headers */,
                                 65DF31F409D1CC60000BE325 /* JSCharacterData.h in Headers */,
                                 BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */,
                                 BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */,
@@ -23989,6 +23989,7 @@
                                 893C47BC1238A0A9002B3D86 /* JSFileWriterCallback.h in Headers */,
                                 49EECF03105070C400099FAB /* JSFloat32Array.h in Headers */,
                                 6EBC5EB0138B50F200A0CF8A /* JSFloat64Array.h in Headers */,
+                               FDA15EAC12B03EE1003A583A /* JSGainNode.h in Headers */,
                                 FE80DA640E9C4703000D6F75 /* JSGeolocation.h in Headers */,
                                 FE80DA660E9C4703000D6F75 /* JSGeoposition.h in Headers */,
                                 8482B7521198CB6B00BFB005 /* JSHashChangeEvent.h in Headers */,
@@ -24095,7 +24096,6 @@
                                 49EECF07105070C400099FAB /* JSInt16Array.h in Headers */,
                                 49EECF05105070C400099FAB /* JSInt32Array.h in Headers */,
                                 49C7B9961042D2D30009D447 /* JSInt8Array.h in Headers */,
-                               FDA15ECE12B03F61003A583A /* JSJavaScriptAudioNode.h in Headers */,
                                 1C5FAED20DCFD90100D58F78 /* JSJavaScriptCallFrame.h in Headers */,
                                 A86629D309DA2B48009633A5 /* JSKeyboardEvent.h in Headers */,
                                 935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */,
@@ -24133,9 +24133,10 @@
                                 6EBF0E7712A9868800DB1709 /* JSOESTextureFloat.h in Headers */,
                                 77A17AA712F28B2A004E02F6 /* JSOESVertexArrayObject.h in Headers */,
                                 FDF6BAF9134A4C9800822920 /* JSOfflineAudioCompletionEvent.h in Headers */,
-                               FDEA6243152102E200479DF0 /* JSOscillator.h in Headers */,
+                               FDEA6243152102E200479DF0 /* JSOscillatorNode.h in Headers */,
                                 1A0D57410A5C7867007EDD4C /* JSOverflowEvent.h in Headers */,
                                 E1284BB110449FFA00EAEB52 /* JSPageTransitionEvent.h in Headers */,
+                               FDA15EB212B03EE1003A583A /* JSPannerNode.h in Headers */,
                                 8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */,
                                 8A9A587111E84C36008ACFD1 /* JSPerformanceNavigation.h in Headers */,
                                 8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */,
@@ -24150,11 +24151,11 @@
                                 B658FFA21522EF3A00DD5595 /* JSRadioNodeList.h in Headers */,
                                 65DF320209D1CC60000BE325 /* JSRange.h in Headers */,
                                 D23CA55D0AB0EAAE005108A5 /* JSRangeException.h in Headers */,
-                               FDA15ECA12B03F50003A583A /* JSRealtimeAnalyserNode.h in Headers */,
                                 BCFE2F120C1B58380020235F /* JSRect.h in Headers */,
                                 4998AECE13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.h in Headers */,
                                 BC74DA491013F468007987AD /* JSRGBColor.h in Headers */,
                                 BCEC01C30C274DDD009F4EC9 /* JSScreen.h in Headers */,
+                               FDA15ECE12B03F61003A583A /* JSScriptProcessorNode.h in Headers */,
                                 9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */,
                                 9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
                                 4A1E71A614E106AC00626F9D /* JSShadowRoot.h in Headers */,
@@ -24405,6 +24406,7 @@
                                 85EC9AFB0A71A2C600EEEAED /* Language.h in Headers */,
                                 2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */,
                                 2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */,
+                               931D72F615FE695300C4C07E /* LayoutMilestones.h in Headers */,
                                 A12538D413F9B60A00024754 /* LayoutRepainter.h in Headers */,
                                 2D9066070BE141D400956998 /* LayoutState.h in Headers */,
                                 D630E2AC149BF344005B2F93 /* LayoutTestSupport.h in Headers */,
@@ -24572,7 +24574,7 @@
                                 0014628B103CD1DE000B20DB /* OriginAccessEntry.h in Headers */,
                                 97BC6A381505F081001B74AC /* OriginQuotaManager.h in Headers */,
                                 97BC6A3A1505F081001B74AC /* OriginUsageRecord.h in Headers */,
-                               FD581FAF1520F91F003A7A75 /* Oscillator.h in Headers */,
+                               FD581FAF1520F91F003A7A75 /* OscillatorNode.h in Headers */,
                                 BC5EB5DD0E81B8DD00B25965 /* OutlineValue.h in Headers */,
                                 1A0D57370A5C77FE007EDD4C /* OverflowEvent.h in Headers */,
                                 3774ABA50FA21EB400AD7DE9 /* OverlapTestRequestClient.h in Headers */,
@@ -24597,8 +24599,10 @@
                                 0885068011DA045B00182B98 /* PaintPhase.h in Headers */,
                                 A80E6CFB0A1989CA007FB8C5 /* Pair.h in Headers */,
                                 FD3160A312B026F700C1A359 /* Panner.h in Headers */,
+                               FD31601A12B0267600C1A359 /* PannerNode.h in Headers */,
                                 BC76AC130DD7AD5C00415F34 /* ParserUtilities.h in Headers */,
                                 F55B3DCA1251F12D003EF269 /* PasswordInputType.h in Headers */,
+                               4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */,
                                 C598905714E9C28000E8D18B /* PasteboardStrategy.h in Headers */,
                                 B27535800B053814002CE64F /* Path.h in Headers */,
                                 A88DD4870B4629A300C02990 /* PathTraversalState.h in Headers */,
@@ -24625,6 +24629,7 @@
                                 49182B5315DCE6F000548418 /* PlatformInstrumentation.h in Headers */,
                                 935C476809AC4D4300A6AAB4 /* PlatformKeyboardEvent.h in Headers */,
                                 0562F9611573F88F0031CA16 /* PlatformLayer.h in Headers */,
+                               4F7B4A6615FF6D6A006B5F22 /* PlatformMemoryInstrumentation.h in Headers */,
                                 932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */,
                                 41BF70100FE86F61005E8DEC /* PlatformMessagePortChannel.h in Headers */,
                                 935C476909AC4D4300A6AAB4 /* PlatformMouseEvent.h in Headers */,
@@ -24686,7 +24691,6 @@
                                 F55B3DCE1251F12D003EF269 /* RangeInputType.h in Headers */,
                                 A84D827C11D333ED00972990 /* RawDataDocumentParser.h in Headers */,
                                 FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
-                               FD31603E12B0267600C1A359 /* RealtimeAnalyserNode.h in Headers */,
                                 BC4368E80C226E32005EFB5F /* Rect.h in Headers */,
                                 A72EA3BB1585CF55004FAA26 /* RefCountedSupplement.h in Headers */,
                                 9831AE4A154225C900FE2644 /* ReferrerPolicy.h in Headers */,
@@ -24734,6 +24738,7 @@
                                 0F580CFF0F12DE9B0051D689 /* RenderLayerBacking.h in Headers */,
                                 0F580CFD0F12DE9B0051D689 /* RenderLayerCompositor.h in Headers */,
                                 50D10D9A1545F5760096D288 /* RenderLayerFilterInfo.h in Headers */,
+                               3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */,
                                 0BE030A20F3112FB003C1A46 /* RenderLineBoxList.h in Headers */,
                                 ABB5419F0ACDDFE4002820EB /* RenderListBox.h in Headers */,
                                 A8EA7A520A191A5200A8EF5F /* RenderListItem.h in Headers */,
@@ -24777,6 +24782,7 @@
                                 458FE40A1589DF0B005609E6 /* RenderSearchField.h in Headers */,
                                 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */,
                                 AB247A6D0AFD6383003FA5FD /* RenderSlider.h in Headers */,
+                               31955A88160D199200858025 /* RenderSnapshottedPlugIn.h in Headers */,
                                 BC8C8FAE0DDCD31B00B592F4 /* RenderStyle.h in Headers */,
                                 BC5EB6680E81CB7100B25965 /* RenderStyleConstants.h in Headers */,
                                 436708C112D9CA4B00044234 /* RenderSVGBlock.h in Headers */,
@@ -24824,7 +24830,6 @@
                                 86FF886215DE3D0700BD6B28 /* RenderTextTrackCue.h in Headers */,
                                 BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */,
                                 BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */,
-                               3C244FEAA375AC633F88BE6F /* RenderLayerModelObject.h in Headers */,
                                 93F1998C08245E59001E9ABC /* RenderTreeAsText.h in Headers */,
                                 E44614520CD68A3500FADA75 /* RenderVideo.h in Headers */,
                                 BCEA4868097D93020094C9E4 /* RenderView.h in Headers */,
@@ -24834,6 +24839,7 @@
                                 93309E0A099E64920056E581 /* ReplaceSelectionCommand.h in Headers */,
                                 4998AEC613F9D0EA0090B1AA /* RequestAnimationFrameCallback.h in Headers */,
                                 F55B3DD01251F12D003EF269 /* ResetInputType.h in Headers */,
+                               514BC843161CF05C004D52F4 /* ResourceBuffer.h in Headers */,
                                 7EE6846A12D26E3800E79415 /* ResourceError.h in Headers */,
                                 934F713C0D5A6F1900018D69 /* ResourceErrorBase.h in Headers */,
                                 514C76790CE923A1007EF3CD /* ResourceHandle.h in Headers */,
@@ -24856,12 +24862,12 @@
                                 FD3160A912B026F700C1A359 /* ReverbConvolver.h in Headers */,
                                 FD3160AB12B026F700C1A359 /* ReverbConvolverStage.h in Headers */,
                                 FD3160AD12B026F700C1A359 /* ReverbInputBuffer.h in Headers */,
-                               A79BADA2161E7F3F00C2E652 /* RuleFeature.h in Headers */,
-                               A79BADA4161E7F3F00C2E652 /* RuleSet.h in Headers */,
                                 BC74DA371013F3F7007987AD /* RGBColor.h in Headers */,
                                 A8CFF5E10A155A05000A4234 /* RootInlineBox.h in Headers */,
                                 49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
                                 A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
+                               A79BADA2161E7F3F00C2E652 /* RuleFeature.h in Headers */,
+                               A79BADA4161E7F3F00C2E652 /* RuleSet.h in Headers */,
                                 BC0B358814C4F9830055E22A /* RunLoop.h in Headers */,
                                 1C63A2480F71646600C09D5A /* RunLoopTimer.h in Headers */,
                                 1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */,
@@ -24896,6 +24902,7 @@
                                 9F3B947E12241758005304E7 /* ScriptHeapSnapshot.h in Headers */,
                                 934CC1170EDCAC7300A658F2 /* ScriptInstance.h in Headers */,
                                 41F066E40F64BCF600A07EAC /* ScriptObject.h in Headers */,
+                               FD31603612B0267600C1A359 /* ScriptProcessorNode.h in Headers */,
                                 9F72304F11184B4100AD0126 /* ScriptProfile.h in Headers */,
                                 9FA37EE41172FC8000C4CD55 /* ScriptProfileNode.h in Headers */,
                                 9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */,
@@ -24917,6 +24924,10 @@
                                 1AA84F05143BA7BD0051D153 /* ScrollElasticityController.h in Headers */,
                                 0F605AED15F94848004DF0C0 /* ScrollingConstraints.h in Headers */,
                                 1AF62EE814DA22A70041556C /* ScrollingCoordinator.h in Headers */,
+                               9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
+                               931CBD0D161A44E900E4C874 /* ScrollingStateNode.h in Headers */,
+                               931CBD0F161A44E900E4C874 /* ScrollingStateScrollingNode.h in Headers */,
+                               931CBD11161A44E900E4C874 /* ScrollingStateTree.h in Headers */,
                                 1AF62F2614DAFEA10041556C /* ScrollingThread.h in Headers */,
                                 1AAADDA414DB409F00AF64B3 /* ScrollingTree.h in Headers */,
                                 1AAADDE414DC8C8F00AF64B3 /* ScrollingTreeNode.h in Headers */,
@@ -24951,6 +24962,7 @@
                                 41D168E810226E89009BC827 /* SharedWorkerContext.h in Headers */,
                                 41D168EA10226E89009BC827 /* SharedWorkerRepository.h in Headers */,
                                 41D168EE10226E89009BC827 /* SharedWorkerThread.h in Headers */,
+                               5728BD9E1625369600C40B56 /* SiblingTraversalStrategies.h in Headers */,
                                 B2C3DA650D006CD600EF6F26 /* SimpleFontData.h in Headers */,
                                 C5A1EA7D152BCF08004D00B6 /* SimplifyMarkupCommand.h in Headers */,
                                 FD00D7A514A3F61900734011 /* SincResampler.h in Headers */,
@@ -25588,18 +25600,6 @@
                                 E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
                                 977E2E0F12F0FC9C00C13379 /* XSSAuditor.h in Headers */,
                                 FD537353137B651800008DCE /* ZeroPole.h in Headers */,
-                               FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
-                               4F7B4A6615FF6D6A006B5F22 /* PlatformMemoryInstrumentation.h in Headers */,
-                               931D72F615FE695300C4C07E /* LayoutMilestones.h in Headers */,
-                               1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */,
-                               931CBD0D161A44E900E4C874 /* ScrollingStateNode.h in Headers */,
-                               931CBD0F161A44E900E4C874 /* ScrollingStateScrollingNode.h in Headers */,
-                               931CBD11161A44E900E4C874 /* ScrollingStateTree.h in Headers */,
-                               6EAF34101613869A00859625 /* ExclusionPolygon.h in Headers */,
-                               31955A88160D199200858025 /* RenderSnapshottedPlugIn.h in Headers */,
-                               514BC843161CF05C004D52F4 /* ResourceBuffer.h in Headers */,
-                               5728BD9E1625369600C40B56 /* SiblingTraversalStrategies.h in Headers */,
-                               9391A991162746CB00297330 /* ScrollingCoordinatorMac.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -25981,6 +25981,7 @@
                                 84D0C4041115F1D40018AA34 /* AffineTransform.cpp in Sources */,
                                 CE08C3D1152B599A0021B8C2 /* AlternativeTextController.cpp in Sources */,
                                 CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */,
+                               FD31603D12B0267600C1A359 /* AnalyserNode.cpp in Sources */,
                                 490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */,
                                 49E912AA0EFAC906009D0CAF /* Animation.cpp in Sources */,
                                 316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */,
@@ -26011,19 +26012,15 @@
                                 FD31607B12B026F700C1A359 /* AudioBus.cpp in Sources */,
                                 FD3160BB12B0272A00C1A359 /* AudioBusMac.mm in Sources */,
                                 FD31607D12B026F700C1A359 /* AudioChannel.cpp in Sources */,
-                               FD315FFE12B0267600C1A359 /* AudioChannelMerger.cpp in Sources */,
-                               FD31600112B0267600C1A359 /* AudioChannelSplitter.cpp in Sources */,
                                 FD31600412B0267600C1A359 /* AudioContext.cpp in Sources */,
                                 FD3160BC12B0272A00C1A359 /* AudioDestinationMac.cpp in Sources */,
                                 FD31600712B0267600C1A359 /* AudioDestinationNode.cpp in Sources */,
                                 FD31608112B026F700C1A359 /* AudioDSPKernelProcessor.cpp in Sources */,
                                 FD3160BE12B0272A00C1A359 /* AudioFileReaderMac.cpp in Sources */,
-                               FD31600C12B0267600C1A359 /* AudioGainNode.cpp in Sources */,
                                 FD31600F12B0267600C1A359 /* AudioListener.cpp in Sources */,
                                 FD31601212B0267600C1A359 /* AudioNode.cpp in Sources */,
                                 FD31601512B0267600C1A359 /* AudioNodeInput.cpp in Sources */,
                                 FD31601712B0267600C1A359 /* AudioNodeOutput.cpp in Sources */,
-                               FD31601912B0267600C1A359 /* AudioPannerNode.cpp in Sources */,
                                 FD31601C12B0267600C1A359 /* AudioParam.cpp in Sources */,
                                 FD35918F138DB22000E1EBEC /* AudioParamTimeline.cpp in Sources */,
                                 FD31601F12B0267600C1A359 /* AudioProcessingEvent.cpp in Sources */,
@@ -26100,6 +26097,8 @@
                                 49484FCD102CF23C00187DD3 /* CanvasStyle.cpp in Sources */,
                                 6550B69D099DF0270090D781 /* CDATASection.cpp in Sources */,
                                 97BC69DC1505F076001B74AC /* ChangeVersionWrapper.cpp in Sources */,
+                               FD315FFE12B0267600C1A359 /* ChannelMergerNode.cpp in Sources */,
+                               FD31600112B0267600C1A359 /* ChannelSplitterNode.cpp in Sources */,
                                 6550B69F099DF0270090D781 /* CharacterData.cpp in Sources */,
                                 9326DC0C09DAD5D600AFC847 /* CharsetData.cpp in Sources */,
                                 F55B3DB11251F12D003EF269 /* CheckboxInputType.cpp in Sources */,
@@ -26244,10 +26243,10 @@
                                 45861C8116194A7400010F3A /* DateTimeFieldElement.cpp in Sources */,
                                 45861C8316194A7400010F3A /* DateTimeFieldElements.cpp in Sources */,
                                 453EB636159C570400001BB7 /* DateTimeFormat.cpp in Sources */,
-                               45861C8516194A7400010F3A /* DateTimeNumericFieldElement.cpp in Sources */,
-                               45861C8716194A7400010F3A /* DateTimeSymbolicFieldElement.cpp in Sources */,
                                 F55B3DB71251F12D003EF269 /* DateTimeInputType.cpp in Sources */,
                                 F55B3DB91251F12D003EF269 /* DateTimeLocalInputType.cpp in Sources */,
+                               45861C8516194A7400010F3A /* DateTimeNumericFieldElement.cpp in Sources */,
+                               45861C8716194A7400010F3A /* DateTimeSymbolicFieldElement.cpp in Sources */,
                                 45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */,
                                 A8C228A211D5722E00D5A7D3 /* DecodedDataDocumentParser.cpp in Sources */,
                                 4162A450101145AE00DFF3ED /* DedicatedWorkerContext.cpp in Sources */,
@@ -26295,6 +26294,7 @@
                                 CE057FA51220731100A476D5 /* DocumentMarkerController.cpp in Sources */,
                                 14947FFD12F80CD200A0F631 /* DocumentOrderedMap.cpp in Sources */,
                                 A8C2280E11D4A59700D5A7D3 /* DocumentParser.cpp in Sources */,
+                               E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */,
                                 0B9056190F2578BE0095FF6A /* DocumentThreadableLoader.cpp in Sources */,
                                 A8185F3A09765766005826D9 /* DocumentType.cpp in Sources */,
                                 973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */,
@@ -26674,12 +26674,14 @@
                                 A7CACDB113CE875C00BBBE3F /* ExceptionCodePlaceholder.cpp in Sources */,
                                 148AFDA60AF58360008CC700 /* ExceptionHandlers.mm in Sources */,
                                 6E8798BA15F81E4A00BFE4AA /* ExclusionInterval.cpp in Sources */,
+                               6EAF340F1613869A00859625 /* ExclusionPolygon.cpp in Sources */,
                                 6E8798BC15F81E4A00BFE4AA /* ExclusionRectangle.cpp in Sources */,
                                 6E8798BE15F81E4A00BFE4AA /* ExclusionShape.cpp in Sources */,
                                 FD748ABF15BF74ED0059CF0D /* ExclusionShapeInsideInfo.cpp in Sources */,
                                 6E67D2A61280E8A4008758F7 /* Extensions3DOpenGL.cpp in Sources */,
                                 44DAB5B115A623580097C1E4 /* Extensions3DOpenGLCommon.cpp in Sources */,
                                 7728694E14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp in Sources */,
+                               97C740141603F7A10011FF2D /* FeatureObserver.cpp in Sources */,
                                 A75E8B880E1DE2D6007F2481 /* FEBlend.cpp in Sources */,
                                 A75E8B8A0E1DE2D6007F2481 /* FEColorMatrix.cpp in Sources */,
                                 A75E8B8C0E1DE2D6007F2481 /* FEComponentTransfer.cpp in Sources */,
@@ -26702,7 +26704,6 @@
                                 FD31609412B026F700C1A359 /* FFTConvolver.cpp in Sources */,
                                 FD31609612B026F700C1A359 /* FFTFrame.cpp in Sources */,
                                 FD3160C012B0272A00C1A359 /* FFTFrameMac.cpp in Sources */,
-                               97C740141603F7A10011FF2D /* FeatureObserver.cpp in Sources */,
                                 976D6C80122B8A3D001FD1F7 /* File.cpp in Sources */,
                                 934FE9E50B5CA539003E4A73 /* FileChooser.cpp in Sources */,
                                 89878561122CA064003AABDA /* FileEntry.cpp in Sources */,
@@ -26785,6 +26786,7 @@
                                 65CBFEF90974F607001DAC25 /* FrameView.cpp in Sources */,
                                 97205AAF123928CA00B17380 /* FTPDirectoryDocument.cpp in Sources */,
                                 51C81B890C4422F70019ECE3 /* FTPDirectoryParser.cpp in Sources */,
+                               FD31600C12B0267600C1A359 /* GainNode.cpp in Sources */,
                                 1432E8490C51493F00B1500F /* GCController.cpp in Sources */,
                                 4FB390AD15EF61F3007AD51F /* GeneratedImage.cpp in Sources */,
                                 2D481F03146B5C6500AA7834 /* GeneratorGeneratedImage.cpp in Sources */,
@@ -26997,10 +26999,10 @@
                                 DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,
                                 F3644AFF1119805900E0D537 /* InjectedScript.cpp in Sources */,
                                 AAB6054E15874C58007B5031 /* InjectedScriptBase.cpp in Sources */,
+                               AA73183E159255B900A93E6E /* InjectedScriptCanvasModule.cpp in Sources */,
                                 7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */,
                                 F316396B1329481A00A649CB /* InjectedScriptManager.cpp in Sources */,
                                 AAB6055015874C58007B5031 /* InjectedScriptModule.cpp in Sources */,
-                               AA73183E159255B900A93E6E /* InjectedScriptCanvasModule.cpp in Sources */,
                                 A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */,
                                 A8CFF5E40A155A05000A4234 /* InlineFlowBox.cpp in Sources */,
                                 BCEA4859097D93020094C9E4 /* InlineTextBox.cpp in Sources */,
@@ -27017,6 +27019,7 @@
                                 B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
                                 4F707A9911EF679400ACDA69 /* InspectorBackendDispatcher.cpp in Sources */,
                                 7AA51B6F1483B61600AD2752 /* InspectorBaseAgent.cpp in Sources */,
+                               AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */,
                                 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
                                 F3335BF812E07DC300D33011 /* InspectorConsoleAgent.cpp in Sources */,
                                 1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
@@ -27048,7 +27051,6 @@
                                 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
                                 573D134714CE39FF0057ABCA /* InspectorTypeBuilder.cpp in Sources */,
                                 4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */,
-                               AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */,
                                 F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
                                 F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
                                 B27535600B053814002CE64F /* IntPointCG.cpp in Sources */,
@@ -27058,9 +27060,9 @@
                                 B275357D0B053814002CE64F /* IntRectMac.mm in Sources */,
                                 B27535620B053814002CE64F /* IntSizeCG.cpp in Sources */,
                                 B275357E0B053814002CE64F /* IntSizeMac.mm in Sources */,
-                               FD31603512B0267600C1A359 /* JavaScriptAudioNode.cpp in Sources */,
                                 1C81BA090E97348300266E07 /* JavaScriptCallFrame.cpp in Sources */,
                                 418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */,
+                               FDA15EC912B03F50003A583A /* JSAnalyserNode.cpp in Sources */,
                                 49EECF00105070C400099FAB /* JSArrayBuffer.cpp in Sources */,
                                 BC275CB311C5E85C00C9206C /* JSArrayBufferCustom.cpp in Sources */,
                                 49EECF1B105072F300099FAB /* JSArrayBufferView.cpp in Sources */,
@@ -27070,16 +27072,12 @@
                                 FDF7E9C313AC21DB00A51EAC /* JSAudioBufferCallback.cpp in Sources */,
                                 FDA15E9F12B03EE1003A583A /* JSAudioBufferSourceNode.cpp in Sources */,
                                 FDEAAAF312B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp in Sources */,
-                               FDA15EA112B03EE1003A583A /* JSAudioChannelMerger.cpp in Sources */,
-                               FDA15EA312B03EE1003A583A /* JSAudioChannelSplitter.cpp in Sources */,
                                 FDA15EA512B03EE1003A583A /* JSAudioContext.cpp in Sources */,
                                 FDEAAAF412B02EE400DCF33B /* JSAudioContextCustom.cpp in Sources */,
                                 FDA15EA712B03EE1003A583A /* JSAudioDestinationNode.cpp in Sources */,
                                 FDA15EA912B03EE1003A583A /* JSAudioGain.cpp in Sources */,
-                               FDA15EAB12B03EE1003A583A /* JSAudioGainNode.cpp in Sources */,
                                 FDA15EAD12B03EE1003A583A /* JSAudioListener.cpp in Sources */,
                                 FDA15EAF12B03EE1003A583A /* JSAudioNode.cpp in Sources */,
-                               FDA15EB112B03EE1003A583A /* JSAudioPannerNode.cpp in Sources */,
                                 FDA15EB312B03EE1003A583A /* JSAudioParam.cpp in Sources */,
                                 FDA15EB512B03EE1003A583A /* JSAudioProcessingEvent.cpp in Sources */,
                                 FDA15EB712B03EE1003A583A /* JSAudioSourceNode.cpp in Sources */,
@@ -27097,6 +27095,8 @@
                                 49EED1501051971A00099FAB /* JSCanvasRenderingContextCustom.cpp in Sources */,
                                 93F9B7A00BA6032600854064 /* JSCDATASection.cpp in Sources */,
                                 93BA59B20F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp in Sources */,
+                               FDA15EA112B03EE1003A583A /* JSChannelMergerNode.cpp in Sources */,
+                               FDA15EA312B03EE1003A583A /* JSChannelSplitterNode.cpp in Sources */,
                                 65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */,
                                 BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */,
                                 BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */,
@@ -27235,6 +27235,7 @@
                                 893C47BB1238A0A9002B3D86 /* JSFileWriterCallback.cpp in Sources */,
                                 49EECF02105070C400099FAB /* JSFloat32Array.cpp in Sources */,
                                 6EBC5EAF138B50F200A0CF8A /* JSFloat64Array.cpp in Sources */,
+                               FDA15EAB12B03EE1003A583A /* JSGainNode.cpp in Sources */,
                                 FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */,
                                 FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */,
                                 FE80DA650E9C4703000D6F75 /* JSGeoposition.cpp in Sources */,
@@ -27363,8 +27364,6 @@
                                 49EECF06105070C400099FAB /* JSInt16Array.cpp in Sources */,
                                 49EECF04105070C400099FAB /* JSInt32Array.cpp in Sources */,
                                 49C7B9951042D2D30009D447 /* JSInt8Array.cpp in Sources */,
-                               FDA15ECD12B03F61003A583A /* JSJavaScriptAudioNode.cpp in Sources */,
-                               FDEAAAFE12B02F4900DCF33B /* JSJavaScriptAudioNodeCustom.cpp in Sources */,
                                 1C5FAED10DCFD90100D58F78 /* JSJavaScriptCallFrame.cpp in Sources */,
                                 1C5FAEE70DCFDA6800D58F78 /* JSJavaScriptCallFrameCustom.cpp in Sources */,
                                 A86629D409DA2B48009633A5 /* JSKeyboardEvent.cpp in Sources */,
@@ -27375,8 +27374,8 @@
                                 CD27F6E51457685A0078207D /* JSMediaController.cpp in Sources */,
                                 FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */,
                                 E44614180CD6826900FADA75 /* JSMediaError.cpp in Sources */,
-                               CDB859FA160D494900E5B07F /* JSMediaKeyEvent.cpp in Sources */,
                                 CDB859FB160D494F00E5B07F /* JSMediaKeyError.cpp in Sources */,
+                               CDB859FA160D494900E5B07F /* JSMediaKeyEvent.cpp in Sources */,
                                 BC3C39B60C0D3D8D005F4D7A /* JSMediaList.cpp in Sources */,
                                 1464E06C135EC10600FDB00A /* JSMediaListCustom.cpp in Sources */,
                                 D3A94A46122DC40F00A37BBC /* JSMediaQueryList.cpp in Sources */,
@@ -27421,9 +27420,10 @@
                                 6EBF0E7612A9868800DB1709 /* JSOESTextureFloat.cpp in Sources */,
                                 77A17AA612F28B2A004E02F6 /* JSOESVertexArrayObject.cpp in Sources */,
                                 FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */,
-                               FDEA6242152102E200479DF0 /* JSOscillator.cpp in Sources */,
+                               FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */,
                                 1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources */,
                                 E1284BB210449FFA00EAEB52 /* JSPageTransitionEvent.cpp in Sources */,
+                               FDA15EB112B03EE1003A583A /* JSPannerNode.cpp in Sources */,
                                 8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */,
                                 8A9A587011E84C36008ACFD1 /* JSPerformanceNavigation.cpp in Sources */,
                                 8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */,
@@ -27440,12 +27440,13 @@
                                 B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
                                 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */,
                                 D23CA55F0AB0EAB6005108A5 /* JSRangeException.cpp in Sources */,
-                               FDA15EC912B03F50003A583A /* JSRealtimeAnalyserNode.cpp in Sources */,
                                 BCFE2F110C1B58370020235F /* JSRect.cpp in Sources */,
                                 4998AECD13F9D6C90090B1AA /* JSRequestAnimationFrameCallback.cpp in Sources */,
                                 4998AED413FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp in Sources */,
                                 BC74DA481013F468007987AD /* JSRGBColor.cpp in Sources */,
                                 BCEC01C20C274DDD009F4EC9 /* JSScreen.cpp in Sources */,
+                               FDA15ECD12B03F61003A583A /* JSScriptProcessorNode.cpp in Sources */,
+                               FDEAAAFE12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp in Sources */,
                                 9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
                                 9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
                                 9FA37EE71172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp in Sources */,
@@ -27872,7 +27873,7 @@
                                 0014628A103CD1DE000B20DB /* OriginAccessEntry.cpp in Sources */,
                                 97BC6A371505F081001B74AC /* OriginQuotaManager.cpp in Sources */,
                                 97BC6A391505F081001B74AC /* OriginUsageRecord.cpp in Sources */,
-                               FD581FAE1520F91F003A7A75 /* Oscillator.cpp in Sources */,
+                               FD581FAE1520F91F003A7A75 /* OscillatorNode.cpp in Sources */,
                                 1A0D57360A5C77FE007EDD4C /* OverflowEvent.cpp in Sources */,
                                 65FEA86909833ADE00BED4AB /* Page.cpp in Sources */,
                                 1477E7760BF4134A00152872 /* PageCache.cpp in Sources */,
@@ -27889,6 +27890,7 @@
                                 51E1ECC20C91C90400DC255B /* PageURLRecord.cpp in Sources */,
                                 FFD5B97A135CC97800D5E92A /* PageVisibilityState.cpp in Sources */,
                                 FD3160A212B026F700C1A359 /* Panner.cpp in Sources */,
+                               FD31601912B0267600C1A359 /* PannerNode.cpp in Sources */,
                                 F55B3DC91251F12D003EF269 /* PasswordInputType.cpp in Sources */,
                                 4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */,
                                 B275357F0B053814002CE64F /* Path.cpp in Sources */,
@@ -27914,6 +27916,7 @@
                                 BC5C762A1497FE1400BC4775 /* PlatformEvent.cpp in Sources */,
                                 BCAA486F14A052530088FAC4 /* PlatformEventFactoryMac.mm in Sources */,
                                 49182B5215DCE6F000548418 /* PlatformInstrumentation.cpp in Sources */,
+                               4F1D11BF15FF37200026E908 /* PlatformMemoryInstrumentation.cpp in Sources */,
                                 41BF700F0FE86F61005E8DEC /* PlatformMessagePortChannel.cpp in Sources */,
                                 C598902E14E9B0F800E8D18B /* PlatformPasteboardMac.mm in Sources */,
                                 BC94D1080C274F88006BC617 /* PlatformScreenMac.mm in Sources */,
@@ -27952,7 +27955,6 @@
                                 978D07BA145A0F3C0096908D /* RangeException.cpp in Sources */,
                                 F55B3DCD1251F12D003EF269 /* RangeInputType.cpp in Sources */,
                                 FD31603B12B0267600C1A359 /* RealtimeAnalyser.cpp in Sources */,
-                               FD31603D12B0267600C1A359 /* RealtimeAnalyserNode.cpp in Sources */,
                                 BCAB418113E356E800D8AAF3 /* Region.cpp in Sources */,
                                 85031B4B0A44EFC700F992E0 /* RegisteredEventListener.cpp in Sources */,
                                 B2C3DA2C0D006C1D00EF6F26 /* RegularExpression.cpp in Sources */,
@@ -27996,6 +27998,7 @@
                                 0F580D000F12DE9B0051D689 /* RenderLayerBacking.cpp in Sources */,
                                 0F580CFE0F12DE9B0051D689 /* RenderLayerCompositor.cpp in Sources */,
                                 50D10D991545F5760096D288 /* RenderLayerFilterInfo.cpp in Sources */,
+                               3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */,
                                 BC33FB1B0F30EE85002CDD7C /* RenderLineBoxList.cpp in Sources */,
                                 ABB5419E0ACDDFE4002820EB /* RenderListBox.cpp in Sources */,
                                 A8EA7A4E0A191A5200A8EF5F /* RenderListItem.cpp in Sources */,
@@ -28037,6 +28040,7 @@
                                 BC3BE9A50E9C239600835588 /* RenderScrollbarTheme.cpp in Sources */,
                                 458FE4091589DF0B005609E6 /* RenderSearchField.cpp in Sources */,
                                 AB247A6C0AFD6383003FA5FD /* RenderSlider.cpp in Sources */,
+                               31955A86160D199000858025 /* RenderSnapshottedPlugIn.cpp in Sources */,
                                 BC8C8FAD0DDCD31B00B592F4 /* RenderStyle.cpp in Sources */,
                                 0F4E57171313276200CF85AF /* RenderSVGAllInOne.cpp in Sources */,
                                 A8DF4AEC0980C42C0052981B /* RenderTable.cpp in Sources */,
@@ -28054,7 +28058,6 @@
                                 BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */,
                                 BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */,
                                 93F19AD508245E59001E9ABC /* RenderTreeAsText.cpp in Sources */,
-                               3C244FEBA375AC633F88BE6F /* RenderLayerModelObject.cpp in Sources */,
                                 E44614510CD68A3500FADA75 /* RenderVideo.cpp in Sources */,
                                 BCEA4867097D93020094C9E4 /* RenderView.cpp in Sources */,
                                 A871DFE50A15376B00B12A68 /* RenderWidget.cpp in Sources */,
@@ -28062,6 +28065,8 @@
                                 A89CCC520F44E98100B5DA10 /* ReplaceNodeWithSpanCommand.cpp in Sources */,
                                 93309E09099E64920056E581 /* ReplaceSelectionCommand.cpp in Sources */,
                                 F55B3DCF1251F12D003EF269 /* ResetInputType.cpp in Sources */,
+                               514BC842161CF05C004D52F4 /* ResourceBuffer.cpp in Sources */,
+                               514BC83F161CF04A004D52F4 /* ResourceBuffer.mm in Sources */,
                                 934F713E0D5A6F2800018D69 /* ResourceErrorBase.cpp in Sources */,
                                 7EE6846B12D26E3800E79415 /* ResourceErrorCF.cpp in Sources */,
                                 514C76500CE9234E007EF3CD /* ResourceErrorMac.mm in Sources */,
@@ -28125,6 +28130,7 @@
                                 41002CCE0F66EDEF009E660D /* ScriptFunctionCall.cpp in Sources */,
                                 4FD8D0F2119C718B002FA825 /* ScriptGCEvent.cpp in Sources */,
                                 41F066E50F64BCF600A07EAC /* ScriptObject.cpp in Sources */,
+                               FD31603512B0267600C1A359 /* ScriptProcessorNode.cpp in Sources */,
                                 F33F0282120947F200E5743A /* ScriptProfile.cpp in Sources */,
                                 9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */,
                                 8A413AE11207BBA50082016E /* ScriptRunner.cpp in Sources */,
@@ -28143,6 +28149,10 @@
                                 0F605AEC15F94848004DF0C0 /* ScrollingConstraints.cpp in Sources */,
                                 1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */,
                                 1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */,
+                               931CBD0C161A44E900E4C874 /* ScrollingStateNode.cpp in Sources */,
+                               931CBD13161A44F800E4C874 /* ScrollingStateNodeMac.mm in Sources */,
+                               931CBD0E161A44E900E4C874 /* ScrollingStateScrollingNode.cpp in Sources */,
+                               931CBD10161A44E900E4C874 /* ScrollingStateTree.cpp in Sources */,
                                 1AF62F2514DAFE9E0041556C /* ScrollingThread.cpp in Sources */,
                                 1AF62F2414DAFE910041556C /* ScrollingThreadMac.mm in Sources */,
                                 1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */,
@@ -28694,16 +28704,6 @@
                                 E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
                                 977E2E0E12F0FC9C00C13379 /* XSSAuditor.cpp in Sources */,
                                 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
-                               E47E276816036EDC00EE2AFB /* DocumentStyleSheetCollection.cpp in Sources */,
-                               4F1D11BF15FF37200026E908 /* PlatformMemoryInstrumentation.cpp in Sources */,
-                               931CBD0C161A44E900E4C874 /* ScrollingStateNode.cpp in Sources */,
-                               931CBD0E161A44E900E4C874 /* ScrollingStateScrollingNode.cpp in Sources */,
-                               931CBD10161A44E900E4C874 /* ScrollingStateTree.cpp in Sources */,
-                               931CBD13161A44F800E4C874 /* ScrollingStateNodeMac.mm in Sources */,
-                               6EAF340F1613869A00859625 /* ExclusionPolygon.cpp in Sources */,
-                               31955A86160D199000858025 /* RenderSnapshottedPlugIn.cpp in Sources */,
-                               514BC83F161CF04A004D52F4 /* ResourceBuffer.mm in Sources */,
-                               514BC842161CF05C004D52F4 /* ResourceBuffer.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
diff --git a/Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp b/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp

similarity index 87%

rename from Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp

rename to Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp

index 99f198818877ff0da01e76ada5924691b31cae3b..7ea27e7c9b2fc85c02513c4178b5450f4c4ad8ad 100644 (file)
--- a/Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp
@@ -26,22 +26,22 @@
  
  #if ENABLE(WEB_AUDIO)
  
-#include "JavaScriptAudioNode.h"
+#include "ScriptProcessorNode.h"
  
-#include "JSJavaScriptAudioNode.h"
+#include "JSScriptProcessorNode.h"
  
  using namespace JSC;
  
  namespace WebCore {
  
-void JSJavaScriptAudioNode::visitChildren(JSCell* cell, SlotVisitor& visitor)
+void JSScriptProcessorNode::visitChildren(JSCell* cell, SlotVisitor& visitor)
  {
-    JSJavaScriptAudioNode* thisObject = jsCast<JSJavaScriptAudioNode*>(cell);
+    JSScriptProcessorNode* thisObject = jsCast<JSScriptProcessorNode*>(cell);
      ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
      COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
      ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
      Base::visitChildren(thisObject, visitor);
-    static_cast<JavaScriptAudioNode*>(thisObject->impl())->visitJSEventListeners(visitor);
+    static_cast<ScriptProcessorNode*>(thisObject->impl())->visitJSEventListeners(visitor);
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/dom/EventTarget.h b/Source/WebCore/dom/EventTarget.h

index e2ec82bd317ca54ea4155235f805fe24ca59be00..146f6a899a7833426c57b0077b76ae3825fda4e8 100644 (file)
--- a/Source/WebCore/dom/EventTarget.h
+++ b/Source/WebCore/dom/EventTarget.h
@@ -53,7 +53,7 @@ namespace WebCore {
      class IDBRequest;
      class IDBTransaction;
      class IDBVersionChangeRequest;
-    class JavaScriptAudioNode;
+    class ScriptProcessorNode;
      class LocalMediaStream;
      class MediaController;
      class MediaSource;
diff --git a/Source/WebCore/dom/EventTargetFactory.in b/Source/WebCore/dom/EventTargetFactory.in

index 7c39bd3f436e41ff086ccf0d5108e7e5b4edb281..7e88ea409b2136db08e48e0c4464cb16082c59a7 100644 (file)
--- a/Source/WebCore/dom/EventTargetFactory.in
+++ b/Source/WebCore/dom/EventTargetFactory.in
@@ -13,7 +13,7 @@ IDBOpenDBRequest conditional=INDEXED_DATABASE
  IDBRequest conditional=INDEXED_DATABASE
  IDBTransaction conditional=INDEXED_DATABASE
  IDBVersionChangeRequest conditional=INDEXED_DATABASE
-JavaScriptAudioNode conditional=WEB_AUDIO
+ScriptProcessorNode conditional=WEB_AUDIO
  LocalMediaStream conditional=MEDIA_STREAM
  MediaController conditional=VIDEO
  MediaSource conditional=MEDIA_SOURCE
diff --git a/Tools/ChangeLog b/Tools/ChangeLog

index 2e7027331f696bfc1e753821c405b0d58a52e2d0..369863332e7cd4b2a96dabb5096e22d7dca114e4 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-16  Chris Rogers  <crogers@google.com>
+
+        Rename some AudioNodes
+        https://bugs.webkit.org/show_bug.cgi?id=99358
+
+        Reviewed by Daniel Bates.
+
+        * Scripts/do-webcore-rename:
+
  2012-10-16  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
  
          Implement testRunner.dumpSelectionRect() in WebKitTestRunner
diff --git a/Tools/Scripts/do-webcore-rename b/Tools/Scripts/do-webcore-rename

index c93f0f536e720f1870deb507d0e4a34552e65e6e..cd3cdee7a96e13ac939bec62a6cc454f8696b69d 100755 (executable)
--- a/Tools/Scripts/do-webcore-rename
+++ b/Tools/Scripts/do-webcore-rename
@@ -93,10 +93,16 @@ sub wanted
  
  # Setting isDOMTypeRename to 1 rather than 0 expands the regexps used
  # below to handle custom JavaScript bindings.
-my $isDOMTypeRename = 0;
+my $isDOMTypeRename = 1;
  my %renames = (
      # Renames go here in the form of:
-    "MediaControls" => "MediaControlRootElement",
+    "JavaScriptAudioNode" => "ScriptProcessorNode",
+    "RealtimeAnalyserNode" => "AnalyserNode",
+    "AudioGainNode" => "GainNode",
+    "AudioPannerNode" => "PannerNode",
+    "AudioChannelSplitter" => "ChannelSplitterNode",
+    "AudioChannelMerger" => "ChannelMergerNode",
+    "Oscillator" => "OscillatorNode",
  );
  
  my %renamesContemplatedForTheFuture = (
author	crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)
committer	crogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 16 Oct 2012 19:43:53 +0000 (19:43 +0000)
Source/WebCore/CMakeLists.txt		patch \| blob \| history
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/DerivedSources.make		patch \| blob \| history
Source/WebCore/DerivedSources.pri		patch \| blob \| history
Source/WebCore/GNUmakefile.list.am		patch \| blob \| history
Source/WebCore/Modules/webaudio/AnalyserNode.cpp	[moved from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp with 85% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/AnalyserNode.h	[moved from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h with 82% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/AnalyserNode.idl	[moved from Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl with 97% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/AudioBufferSourceNode.cpp		patch \| blob \| history
Source/WebCore/Modules/webaudio/AudioBufferSourceNode.h		patch \| blob \| history
Source/WebCore/Modules/webaudio/AudioContext.cpp		patch \| blob \| history
Source/WebCore/Modules/webaudio/AudioContext.h		patch \| blob \| history
Source/WebCore/Modules/webaudio/AudioContext.idl		patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelMergerNode.cpp	[moved from Source/WebCore/Modules/webaudio/AudioChannelMerger.cpp with 88% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelMergerNode.h	[moved from Source/WebCore/Modules/webaudio/AudioChannelMerger.h with 86% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelMergerNode.idl	[moved from Source/WebCore/Modules/webaudio/AudioChannelMerger.idl with 97% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelSplitterNode.cpp	[moved from Source/WebCore/Modules/webaudio/AudioChannelSplitter.cpp with 86% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelSplitterNode.h	[moved from Source/WebCore/Modules/webaudio/AudioChannelSplitter.h with 83% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ChannelSplitterNode.idl	[moved from Source/WebCore/Modules/webaudio/AudioChannelSplitter.idl with 96% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/DOMWindowWebAudio.idl		patch \| blob \| history
Source/WebCore/Modules/webaudio/GainNode.cpp	[moved from Source/WebCore/Modules/webaudio/AudioGainNode.cpp with 94% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/GainNode.h	[moved from Source/WebCore/Modules/webaudio/AudioGainNode.h with 83% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/GainNode.idl	[moved from Source/WebCore/Modules/webaudio/AudioGainNode.idl with 97% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/OscillatorNode.cpp	[moved from Source/WebCore/Modules/webaudio/Oscillator.cpp with 91% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/OscillatorNode.h	[moved from Source/WebCore/Modules/webaudio/Oscillator.h with 90% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/OscillatorNode.idl	[moved from Source/WebCore/Modules/webaudio/Oscillator.idl with 95% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/PannerNode.cpp	[moved from Source/WebCore/Modules/webaudio/AudioPannerNode.cpp with 91% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/PannerNode.h	[moved from Source/WebCore/Modules/webaudio/AudioPannerNode.h with 93% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/PannerNode.idl	[moved from Source/WebCore/Modules/webaudio/AudioPannerNode.idl with 98% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp	[moved from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp with 88% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ScriptProcessorNode.h	[moved from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.h with 92% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/ScriptProcessorNode.idl	[moved from Source/WebCore/Modules/webaudio/JavaScriptAudioNode.idl with 97% similarity]	patch \| blob \| history
Source/WebCore/Modules/webaudio/WaveTable.cpp		patch \| blob \| history
Source/WebCore/Target.pri		patch \| blob \| history
Source/WebCore/UseJSC.cmake		patch \| blob \| history
Source/WebCore/WebCore.gypi		patch \| blob \| history
Source/WebCore/WebCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/WebCore/bindings/js/JSScriptProcessorNodeCustom.cpp	[moved from Source/WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp with 87% similarity]	patch \| blob \| history
Source/WebCore/dom/EventTarget.h		patch \| blob \| history
Source/WebCore/dom/EventTargetFactory.in		patch \| blob \| history
Tools/ChangeLog		patch \| blob \| history
Tools/Scripts/do-webcore-rename		patch \| blob \| history