Title: [155248] trunk/Source/WebCore
- Revision
- 155248
- Author
- [email protected]
- Date
- 2013-09-06 23:45:04 -0700 (Fri, 06 Sep 2013)
Log Message
Get MEDIA_STREAM compiling for other ports (EFL and GTK)
https://bugs.webkit.org/show_bug.cgi?id=120811
Patch by Thiago de Barros Lacerda <[email protected]> on 2013-09-06
Reviewed by Eric Carlson.
* CMakeLists.txt:
* GNUmakefile.list.am:
* Modules/mediastream/LocalMediaStream.h:
* Modules/mediastream/MediaStreamRegistry.cpp:
(WebCore::MediaStreamRegistry::lookupMediaStreamDescriptor):
* Modules/mediastream/RTCStatsResponse.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (155247 => 155248)
--- trunk/Source/WebCore/CMakeLists.txt 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-09-07 06:45:04 UTC (rev 155248)
@@ -268,6 +268,7 @@
Modules/webaudio/DynamicsCompressorNode.idl
Modules/webaudio/ScriptProcessorNode.idl
Modules/webaudio/MediaElementAudioSourceNode.idl
+ Modules/webaudio/MediaStreamAudioDestinationNode.idl
Modules/webaudio/MediaStreamAudioSourceNode.idl
Modules/webaudio/OfflineAudioContext.idl
Modules/webaudio/OfflineAudioCompletionEvent.idl
@@ -906,6 +907,7 @@
Modules/webaudio/ScriptProcessorNode.cpp
Modules/webaudio/MediaElementAudioSourceNode.cpp
Modules/webaudio/MediaStreamAudioSourceNode.cpp
+ Modules/webaudio/MediaStreamAudioDestinationNode.cpp
Modules/webaudio/OfflineAudioContext.cpp
Modules/webaudio/OfflineAudioCompletionEvent.cpp
Modules/webaudio/OfflineAudioDestinationNode.cpp
Modified: trunk/Source/WebCore/ChangeLog (155247 => 155248)
--- trunk/Source/WebCore/ChangeLog 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/ChangeLog 2013-09-07 06:45:04 UTC (rev 155248)
@@ -1,3 +1,17 @@
+2013-09-06 Thiago de Barros Lacerda <[email protected]>
+
+ Get MEDIA_STREAM compiling for other ports (EFL and GTK)
+ https://bugs.webkit.org/show_bug.cgi?id=120811
+
+ Reviewed by Eric Carlson.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Modules/mediastream/LocalMediaStream.h:
+ * Modules/mediastream/MediaStreamRegistry.cpp:
+ (WebCore::MediaStreamRegistry::lookupMediaStreamDescriptor):
+ * Modules/mediastream/RTCStatsResponse.h:
+
2013-09-06 Bem Jones-Bey <[email protected]>
[CSS Shapes] Floats with shape-outside aren't painting in the correct order
Modified: trunk/Source/WebCore/GNUmakefile.list.am (155247 => 155248)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-09-07 06:45:04 UTC (rev 155248)
@@ -504,6 +504,8 @@
DerivedSources/WebCore/JSMediaStream.h \
DerivedSources/WebCore/JSMediaStreamAudioSourceNode.cpp \
DerivedSources/WebCore/JSMediaStreamAudioSourceNode.h \
+ DerivedSources/WebCore/JSMediaStreamAudioDestinationNode.cpp \
+ DerivedSources/WebCore/JSMediaStreamAudioDestinationNode.h \
DerivedSources/WebCore/JSMediaStreamEvent.cpp \
DerivedSources/WebCore/JSMediaStreamEvent.h \
DerivedSources/WebCore/JSMediaStreamTrack.cpp \
@@ -1293,6 +1295,7 @@
$(WebCore)/Modules/webaudio/ScriptProcessorNode.idl \
$(WebCore)/Modules/webaudio/MediaElementAudioSourceNode.idl \
$(WebCore)/Modules/webaudio/MediaStreamAudioSourceNode.idl \
+ $(WebCore)/Modules/webaudio/MediaStreamAudioDestinationNode.idl \
$(WebCore)/Modules/webaudio/OfflineAudioContext.idl \
$(WebCore)/Modules/webaudio/OfflineAudioCompletionEvent.idl \
$(WebCore)/Modules/webaudio/OscillatorNode.idl \
@@ -2091,6 +2094,8 @@
Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.h \
Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.cpp \
Source/WebCore/Modules/webaudio/MediaStreamAudioSourceNode.h \
+ Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.cpp \
+ Source/WebCore/Modules/webaudio/MediaStreamAudioDestinationNode.h \
Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp \
Source/WebCore/Modules/webaudio/OfflineAudioContext.h \
Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.h \
Modified: trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.h (155247 => 155248)
--- trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.h 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.h 2013-09-07 06:45:04 UTC (rev 155248)
@@ -32,7 +32,7 @@
namespace WebCore {
-class LocalMediaStream FINAL : public MediaStream {
+class LocalMediaStream : public MediaStream {
public:
static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp (155247 => 155248)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp 2013-09-07 06:45:04 UTC (rev 155248)
@@ -56,7 +56,7 @@
MediaStreamDescriptor* MediaStreamRegistry::lookupMediaStreamDescriptor(const String& url)
{
ASSERT(isMainThread());
- return m_streamDescriptors.get(url).get();
+ return m_streamDescriptors.get(url);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h (155247 => 155248)
--- trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h 2013-09-07 06:26:11 UTC (rev 155247)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h 2013-09-07 06:45:04 UTC (rev 155248)
@@ -39,7 +39,7 @@
namespace WebCore {
-class RTCStatsResponse FINAL : public RTCStatsResponseBase {
+class RTCStatsResponse : public RTCStatsResponseBase {
public:
static PassRefPtr<RTCStatsResponse> create();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
