Title: [149175] trunk/Source/WebCore
- Revision
- 149175
- Author
- [email protected]
- Date
- 2013-04-26 04:48:15 -0700 (Fri, 26 Apr 2013)
Log Message
Web Audio: Remove reduplicative addInput() in AnalyserNode.
<http://webkit.org/b/115244>
>From Blink r149155 by <[email protected]>:
The parent class BasicInspectorNode already called addInput() and addOutput().
So it is reduplicative to call them in AnalyserNode.
* Modules/webaudio/AnalyserNode.cpp:
(WebCore::AnalyserNode::AnalyserNode):
* Modules/webaudio/AudioBasicInspectorNode.cpp:
(WebCore::AudioBasicInspectorNode::AudioBasicInspectorNode):
* Modules/webaudio/AudioBasicInspectorNode.h:
(AudioBasicInspectorNode):
* Modules/webaudio/MediaStreamAudioDestinationNode.cpp:
(WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149174 => 149175)
--- trunk/Source/WebCore/ChangeLog 2013-04-26 10:30:32 UTC (rev 149174)
+++ trunk/Source/WebCore/ChangeLog 2013-04-26 11:48:15 UTC (rev 149175)
@@ -1,3 +1,22 @@
+2013-04-26 Andreas Kling <[email protected]>
+
+ Web Audio: Remove reduplicative addInput() in AnalyserNode.
+ <http://webkit.org/b/115244>
+
+ From Blink r149155 by <[email protected]>:
+
+ The parent class BasicInspectorNode already called addInput() and addOutput().
+ So it is reduplicative to call them in AnalyserNode.
+
+ * Modules/webaudio/AnalyserNode.cpp:
+ (WebCore::AnalyserNode::AnalyserNode):
+ * Modules/webaudio/AudioBasicInspectorNode.cpp:
+ (WebCore::AudioBasicInspectorNode::AudioBasicInspectorNode):
+ * Modules/webaudio/AudioBasicInspectorNode.h:
+ (AudioBasicInspectorNode):
+ * Modules/webaudio/MediaStreamAudioDestinationNode.cpp:
+ (WebCore::MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode):
+
2013-04-26 Allan Sandfeld Jensen <[email protected]>
Mouseenter and mouseleave events not supported
Modified: trunk/Source/WebCore/Modules/webaudio/AnalyserNode.cpp (149174 => 149175)
--- trunk/Source/WebCore/Modules/webaudio/AnalyserNode.cpp 2013-04-26 10:30:32 UTC (rev 149174)
+++ trunk/Source/WebCore/Modules/webaudio/AnalyserNode.cpp 2013-04-26 11:48:15 UTC (rev 149175)
@@ -35,11 +35,8 @@
namespace WebCore {
AnalyserNode::AnalyserNode(AudioContext* context, float sampleRate)
- : AudioBasicInspectorNode(context, sampleRate)
+ : AudioBasicInspectorNode(context, sampleRate, 2)
{
- addInput(adoptPtr(new AudioNodeInput(this)));
- addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
-
setNodeType(NodeTypeAnalyser);
initialize();
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp (149174 => 149175)
--- trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp 2013-04-26 10:30:32 UTC (rev 149174)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.cpp 2013-04-26 11:48:15 UTC (rev 149175)
@@ -34,12 +34,12 @@
namespace WebCore {
-AudioBasicInspectorNode::AudioBasicInspectorNode(AudioContext* context, float sampleRate)
+AudioBasicInspectorNode::AudioBasicInspectorNode(AudioContext* context, float sampleRate, unsigned outputChannelCount)
: AudioNode(context, sampleRate)
, m_needAutomaticPull(false)
{
addInput(adoptPtr(new AudioNodeInput(this)));
- addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
+ addOutput(adoptPtr(new AudioNodeOutput(this, outputChannelCount)));
}
// We override pullInputs() as an optimization allowing this node to take advantage of in-place processing,
Modified: trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.h (149174 => 149175)
--- trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.h 2013-04-26 10:30:32 UTC (rev 149174)
+++ trunk/Source/WebCore/Modules/webaudio/AudioBasicInspectorNode.h 2013-04-26 11:48:15 UTC (rev 149175)
@@ -34,7 +34,7 @@
// AudioContext before the end of each render quantum so that it can inspect the audio stream.
class AudioBasicInspectorNode : public AudioNode {
public:
- AudioBasicInspectorNode(AudioContext*, float sampleRate);
+ AudioBasicInspectorNode(AudioContext*, float sampleRate, unsigned outputChannelCount);
// AudioNode
virtual void pullInputs(size_t framesToProcess);
Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp (149174 => 149175)
--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2013-04-26 10:30:32 UTC (rev 149174)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp 2013-04-26 11:48:15 UTC (rev 149175)
@@ -44,7 +44,7 @@
}
MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* context, size_t numberOfChannels)
- : AudioBasicInspectorNode(context, context->sampleRate())
+ : AudioBasicInspectorNode(context, context->sampleRate(), numberOfChannels)
, m_mixBus(numberOfChannels, ProcessingSizeInFrames)
{
setNodeType(NodeTypeMediaStreamAudioDestination);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes