Get MEDIA_STREAM compiling for other ports (EFL and GTK)
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Sep 2013 06:45:04 +0000 (06:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 7 Sep 2013 06:45:04 +0000 (06:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120811

Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155248 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/mediastream/LocalMediaStream.h
Source/WebCore/Modules/mediastream/MediaStreamRegistry.cpp
Source/WebCore/Modules/mediastream/RTCStatsResponse.h

index 344489fcab5e33124c7922e06bb69ebe78773eff..d987b4e388f6766ec5db7f8e99c10dc6b107de51 100644 (file)
@@ -268,6 +268,7 @@ set(WebCore_IDL_FILES
     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 @@ set(WebCore_SOURCES
     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
index 75136e0d1327d45a159a496ae88f36ee470c5e3e..61df6947b5730f553d44ab5a81479190a06c3ebf 100644 (file)
@@ -1,3 +1,17 @@
+2013-09-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        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  <bjonesbe@adobe.com>
 
         [CSS Shapes] Floats with shape-outside aren't painting in the correct order
index 63be6f19b60dc4b49fba056e56c966e2993f2f06..b2460c0525834608e7f2aadb402e89f549c58255 100644 (file)
@@ -504,6 +504,8 @@ webcore_built_sources += \
        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 @@ dom_binding_idls += \
        $(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 @@ webcore_modules_sources += \
        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 \
index 69613bd68ef01c03a23e25886736db4c50bfd63b..7c48107b11bc4e972d9311719b9b3a602d05e0ff 100644 (file)
@@ -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>);
index 843eaab4c7e68a491beba8b62caa62b4fc9fa48e..ce57696f3719b3cef3977373398ec0abc1e23a2d 100644 (file)
@@ -56,7 +56,7 @@ void MediaStreamRegistry::unregisterMediaStreamURL(const KURL& url)
 MediaStreamDescriptor* MediaStreamRegistry::lookupMediaStreamDescriptor(const String& url)
 {
     ASSERT(isMainThread());
-    return m_streamDescriptors.get(url).get();
+    return m_streamDescriptors.get(url);
 }
 
 } // namespace WebCore
index 9c318ca29f7bdb0ffc434337a38b4d9c415378c4..176610b45ea7fab7aafc4214f739aca570623752 100644 (file)
@@ -39,7 +39,7 @@
 
 namespace WebCore {
 
-class RTCStatsResponse FINAL : public RTCStatsResponseBase {
+class RTCStatsResponse : public RTCStatsResponseBase {
 public:
     static PassRefPtr<RTCStatsResponse> create();