Diff
Modified: trunk/Source/WebCore/ChangeLog (94390 => 94391)
--- trunk/Source/WebCore/ChangeLog 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/ChangeLog 2011-09-02 07:58:05 UTC (rev 94391)
@@ -1,3 +1,19 @@
+2011-09-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94389.
+ http://trac.webkit.org/changeset/94389
+ https://bugs.webkit.org/show_bug.cgi?id=67468
+
+ breaks mac build (Requested by philn-tp on #webkit).
+
+ * webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::createMediaElementSource):
+ * webaudio/AudioContext.h:
+ * webaudio/AudioContext.idl:
+ * webaudio/MediaElementAudioSourceNode.cpp:
+ * webaudio/MediaElementAudioSourceNode.h:
+ * webaudio/MediaElementAudioSourceNode.idl:
+
2011-09-02 Kentaro Hara <[email protected]>
Generate an EventSource constructor of V8 using the IDL 'Constructor' extended attribute
Modified: trunk/Source/WebCore/webaudio/AudioContext.cpp (94390 => 94391)
--- trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-09-02 07:58:05 UTC (rev 94391)
@@ -49,9 +49,11 @@
#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"
@@ -59,11 +61,6 @@
#include "WaveShaperNode.h"
#include "ScriptCallStack.h"
-#if ENABLE(VIDEO)
-#include "HTMLMediaElement.h"
-#include "MediaElementAudioSourceNode.h"
-#endif
-
#if DEBUG_AUDIONODE_REFERENCES
#include <stdio.h>
#endif
@@ -315,7 +312,6 @@
return node;
}
-#if ENABLE(VIDEO)
PassRefPtr<MediaElementAudioSourceNode> AudioContext::createMediaElementSource(HTMLMediaElement* mediaElement, ExceptionCode& ec)
{
ASSERT(mediaElement);
@@ -340,7 +336,6 @@
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 (94390 => 94391)
--- trunk/Source/WebCore/webaudio/AudioContext.h 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/AudioContext.h 2011-09-02 07:58:05 UTC (rev 94391)
@@ -110,9 +110,7 @@
// 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 (94390 => 94391)
--- trunk/Source/WebCore/webaudio/AudioContext.idl 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/AudioContext.idl 2011-09-02 07:58:05 UTC (rev 94391)
@@ -59,10 +59,9 @@
// 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 (94390 => 94391)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.cpp 2011-09-02 07:58:05 UTC (rev 94391)
@@ -24,7 +24,7 @@
#include "config.h"
-#if ENABLE(WEB_AUDIO) && ENABLE(VIDEO)
+#if ENABLE(WEB_AUDIO)
#include "MediaElementAudioSourceNode.h"
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h (94390 => 94391)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.h 2011-09-02 07:58:05 UTC (rev 94391)
@@ -25,8 +25,6 @@
#ifndef MediaElementAudioSourceNode_h
#define MediaElementAudioSourceNode_h
-#if ENABLE(VIDEO)
-
#include "AudioSourceNode.h"
#include "HTMLMediaElement.h"
#include <wtf/PassRefPtr.h>
@@ -60,6 +58,4 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO)
-
#endif // MediaElementAudioSourceNode_h
Modified: trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl (94390 => 94391)
--- trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl 2011-09-02 07:41:41 UTC (rev 94390)
+++ trunk/Source/WebCore/webaudio/MediaElementAudioSourceNode.idl 2011-09-02 07:58:05 UTC (rev 94391)
@@ -25,7 +25,6 @@
module audio {
interface [
Conditional=WEB_AUDIO,
- Conditional=VIDEO,
GenerateToJS
] MediaElementAudioSourceNode : AudioSourceNode {
readonly attribute HTMLMediaElement mediaElement;
