Diff
Modified: trunk/Source/WebCore/ChangeLog (94396 => 94397)
--- trunk/Source/WebCore/ChangeLog 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/ChangeLog 2011-09-02 09:58:12 UTC (rev 94397)
@@ -1,3 +1,19 @@
+2011-09-02 Philippe Normand <pnorm...@igalia.com>
+
+ [WebAudio] Undeclared dependency to VIDEO
+ https://bugs.webkit.org/show_bug.cgi?id=66893
+
+ Reviewed by Kenneth Russell.
+
+ Build MediaAudioSourceNode only if VIDEO is enabled
+
+ * webaudio/AudioContext.cpp:
+ * webaudio/AudioContext.h:
+ * webaudio/AudioContext.idl:
+ * webaudio/MediaElementAudioSourceNode.cpp:
+ * webaudio/MediaElementAudioSourceNode.h:
+ * webaudio/MediaElementAudioSourceNode.idl:
+
2011-09-02 Csaba Osztrogonác <o...@webkit.org>
[Qt][WK2] Unreviewed speculative buildfix.
Modified: trunk/Source/WebCore/webaudio/AudioContext.cpp (94396 => 94397)
--- trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-09-02 09:58:12 UTC (rev 94397)
@@ -49,11 +49,9 @@
#include "FFTFrame.h"
#include "HRTFDatabaseLoader.h"
#include "HRTFPanner.h"
-#include "HTMLMediaElement.h"
#include "HighPass2FilterNode.h"
#include "_javascript_AudioNode.h"
#include "LowPass2FilterNode.h"
-#include "MediaElementAudioSourceNode.h"
#include "OfflineAudioCompletionEvent.h"
#include "OfflineAudioDestinationNode.h"
#include "PlatformString.h"
@@ -61,6 +59,11 @@
#include "WaveShaperNode.h"
#include "ScriptCallStack.h"
+#if ENABLE(VIDEO)
+#include "HTMLMediaElement.h"
+#include "MediaElementAudioSourceNode.h"
+#endif
+
#if DEBUG_AUDIONODE_REFERENCES
#include <stdio.h>
#endif
@@ -312,6 +315,7 @@
return node;
}
+#if ENABLE(VIDEO)
PassRefPtr<MediaElementAudioSourceNode> AudioContext::createMediaElementSource(HTMLMediaElement* mediaElement, ExceptionCode& ec)
{
ASSERT(mediaElement);
@@ -336,6 +340,7 @@
refNode(node.get()); // context keeps reference until node is disconnected
return node;
}
+#endif
PassRefPtr<_javascript_AudioNode> AudioContext::createJavaScriptNode(size_t bufferSize)
{
Modified: trunk/Source/WebCore/webaudio/AudioContext.h (94396 => 94397)
--- trunk/Source/WebCore/webaudio/AudioContext.h 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/AudioContext.h 2011-09-02 09:58:12 UTC (rev 94397)
@@ -110,7 +110,9 @@
// The AudioNode create methods are called on the main thread (from _javascript_).
PassRefPtr<AudioBufferSourceNode> createBufferSource();
+#if ENABLE(VIDEO)
PassRefPtr<MediaElementAudioSourceNode> createMediaElementSource(HTMLMediaElement*, ExceptionCode&);
+#endif
PassRefPtr<AudioGainNode> createGainNode();
PassRefPtr<BiquadFilterNode> createBiquadFilter();
PassRefPtr<WaveShaperNode> createWaveShaper();
Modified: trunk/Source/WebCore/webaudio/AudioContext.idl (94396 => 94397)
--- trunk/Source/WebCore/webaudio/AudioContext.idl 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/AudioContext.idl 2011-09-02 09:58:12 UTC (rev 94397)
@@ -59,9 +59,10 @@
// Sources
AudioBufferSourceNode createBufferSource();
+#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
MediaElementAudioSourceNode createMediaElementSource(in HTMLMediaElement mediaElement)
raises(DOMException);
-
+#endif
// Processing nodes
AudioGainNode createGainNode();
DelayNode createDelayNode();
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp (94396 => 94397)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-09-02 09:58:12 UTC (rev 94397)
@@ -24,7 +24,7 @@
#include "config.h"
-#if ENABLE(WEB_AUDIO)
+#if ENABLE(WEB_AUDIO) && ENABLE(VIDEO)
#include "MediaElementAudioSourceNode.h"
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h (94396 => 94397)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h 2011-09-02 09:58:12 UTC (rev 94397)
@@ -25,6 +25,8 @@
#ifndef MediaElementAudioSourceNode_h
#define MediaElementAudioSourceNode_h
+#if ENABLE(VIDEO)
+
#include "AudioSourceNode.h"
#include "HTMLMediaElement.h"
#include <wtf/PassRefPtr.h>
@@ -58,4 +60,6 @@
} // namespace WebCore
+#endif // ENABLE(VIDEO)
+
#endif // MediaElementAudioSourceNode_h
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl (94396 => 94397)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl 2011-09-02 09:53:58 UTC (rev 94396)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl 2011-09-02 09:58:12 UTC (rev 94397)
@@ -24,7 +24,7 @@
module audio {
interface [
- Conditional=WEB_AUDIO,
+ Conditional=WEB_AUDIO&VIDEO,
GenerateToJS
] MediaElementAudioSourceNode : AudioSourceNode {
readonly attribute HTMLMediaElement mediaElement;
