Title: [125440] trunk/Source/WebCore
- Revision
- 125440
- Author
- [email protected]
- Date
- 2012-08-13 13:17:57 -0700 (Mon, 13 Aug 2012)
Log Message
Media(Stream|Element)AudioSourceNode should be guarded by the WEB_AUDIO condition as well
https://bugs.webkit.org/show_bug.cgi?id=93864
Reviewed by Eric Carlson.
Add the WEB_AUDIO to the Conditional attribute in MediaElementAudioSourceNode
IDL file and the ENABLE(WEB_AUDIO) compilation guard to the header files for both
MediaStreamAudioSourceNode and MediaElementAudioSourceNode.
No new tests - no new functionality.
* Modules/webaudio/MediaElementAudioSourceNode.h:
* Modules/webaudio/MediaStreamAudioSourceNode.h:
* Modules/webaudio/MediaStreamAudioSourceNode.idl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125439 => 125440)
--- trunk/Source/WebCore/ChangeLog 2012-08-13 20:12:52 UTC (rev 125439)
+++ trunk/Source/WebCore/ChangeLog 2012-08-13 20:17:57 UTC (rev 125440)
@@ -1,3 +1,20 @@
+2012-08-13 Zan Dobersek <[email protected]>
+
+ Media(Stream|Element)AudioSourceNode should be guarded by the WEB_AUDIO condition as well
+ https://bugs.webkit.org/show_bug.cgi?id=93864
+
+ Reviewed by Eric Carlson.
+
+ Add the WEB_AUDIO to the Conditional attribute in MediaElementAudioSourceNode
+ IDL file and the ENABLE(WEB_AUDIO) compilation guard to the header files for both
+ MediaStreamAudioSourceNode and MediaElementAudioSourceNode.
+
+ No new tests - no new functionality.
+
+ * Modules/webaudio/MediaElementAudioSourceNode.h:
+ * Modules/webaudio/MediaStreamAudioSourceNode.h:
+ * Modules/webaudio/MediaStreamAudioSourceNode.idl:
+
2012-08-13 Simon Hausmann <[email protected]>
[Qt] Clean up exception handling
Modified: trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h (125439 => 125440)
--- trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h 2012-08-13 20:12:52 UTC (rev 125439)
+++ trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h 2012-08-13 20:17:57 UTC (rev 125440)
@@ -25,7 +25,7 @@
#ifndef MediaElementAudioSourceNode_h
#define MediaElementAudioSourceNode_h
-#if ENABLE(VIDEO)
+#if ENABLE(WEB_AUDIO) && ENABLE(VIDEO)
#include "AudioSourceNode.h"
#include "AudioSourceProviderClient.h"
@@ -74,6 +74,6 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO)
+#endif // ENABLE(WEB_AUDIO) && ENABLE(VIDEO)
#endif // MediaElementAudioSourceNode_h
Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.h (125439 => 125440)
--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.h 2012-08-13 20:12:52 UTC (rev 125439)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.h 2012-08-13 20:17:57 UTC (rev 125440)
@@ -25,7 +25,7 @@
#ifndef MediaStreamAudioSourceNode_h
#define MediaStreamAudioSourceNode_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_AUDIO) && ENABLE(MEDIA_STREAM)
#include "AudioSourceNode.h"
#include "AudioSourceProvider.h"
@@ -72,6 +72,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_AUDIO) && ENABLE(MEDIA_STREAM)
#endif // MediaStreamAudioSourceNode_h
Modified: trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl (125439 => 125440)
--- trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl 2012-08-13 20:12:52 UTC (rev 125439)
+++ trunk/Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.idl 2012-08-13 20:17:57 UTC (rev 125440)
@@ -24,7 +24,7 @@
module audio {
interface [
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_AUDIO&MEDIA_STREAM,
JSGenerateToJSObject
] MediaStreamAudioSourceNode : AudioSourceNode {
readonly attribute MediaStream mediaStream;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
