Rename MediaStreamCenter to RealtimeMediaSourceCenter
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2015 08:10:07 +0000 (08:10 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2015 08:10:07 +0000 (08:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142535

Reviewed by Eric Carlson.

As per bug title, rename MediaStreamCenter to
RealtimeMediaSourceCenter, this class manages
RealtimeMediaSources, not MediaStreams. Some un-needed includes of
the header were also removed.

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

19 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Modules/mediastream/MediaStream.cpp
Source/WebCore/Modules/mediastream/MediaStream.h
Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp
Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp [moved from Source/WebCore/platform/mediastream/MediaStreamCenter.cpp with 77% similarity]
Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h [moved from Source/WebCore/platform/mediastream/MediaStreamCenter.h with 86% similarity]
Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h
Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h
Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp [moved from Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp with 84% similarity]
Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.h [moved from Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h with 87% similarity]
Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp [moved from Source/WebCore/platform/mock/MockMediaStreamCenter.cpp with 91% similarity]
Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.h [moved from Source/WebCore/platform/mock/MockMediaStreamCenter.h with 84% similarity]
Source/WebCore/testing/Internals.cpp

index 634afd0..9c78fb7 100644 (file)
@@ -2166,10 +2166,10 @@ set(WebCore_SOURCES
     platform/graphics/transforms/TransformationMatrix.cpp
     platform/graphics/transforms/TranslateTransformOperation.cpp
 
-    platform/mediastream/MediaStreamCenter.cpp
     platform/mediastream/MediaStreamPrivate.cpp
     platform/mediastream/MediaStreamTrackPrivate.cpp
     platform/mediastream/RealtimeMediaSource.cpp
+    platform/mediastream/RealtimeMediaSourceCenter.cpp
     platform/mediastream/RealtimeMediaSourceStates.cpp
     platform/mediastream/RTCIceCandidateDescriptor.cpp
     platform/mediastream/RTCPeerConnectionHandler.cpp
@@ -2179,7 +2179,7 @@ set(WebCore_SOURCES
     platform/mock/DeviceOrientationClientMock.cpp
     platform/mock/GeolocationClientMock.cpp
     platform/mock/MediaConstraintsMock.cpp
-    platform/mock/MockMediaStreamCenter.cpp
+    platform/mock/MockRealtimeMediaSourceCenter.cpp
     platform/mock/RTCDataChannelHandlerMock.cpp
     platform/mock/RTCDTMFSenderHandlerMock.cpp
     platform/mock/RTCNotifiersMock.cpp
index 2f35b27..b61bc41 100644 (file)
@@ -1,3 +1,15 @@
+2015-03-10  Philippe Normand  <pnormand@igalia.com>
+
+        Rename MediaStreamCenter to RealtimeMediaSourceCenter
+        https://bugs.webkit.org/show_bug.cgi?id=142535
+
+        Reviewed by Eric Carlson.
+
+        As per bug title, rename MediaStreamCenter to
+        RealtimeMediaSourceCenter, this class manages
+        RealtimeMediaSources, not MediaStreams. Some un-needed includes of
+        the header were also removed.
+
 2015-03-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Remove unnecessary create() factory functions
index c6b0400..6a9ab18 100644 (file)
@@ -33,7 +33,6 @@
 #include "AudioStreamTrack.h"
 #include "Event.h"
 #include "ExceptionCode.h"
-#include "MediaStreamCenter.h"
 #include "MediaStreamRegistry.h"
 #include "MediaStreamTrackEvent.h"
 #include "RealtimeMediaSource.h"
index e7fd502..f458663 100644 (file)
@@ -43,8 +43,6 @@
 
 namespace WebCore {
 
-class MediaStreamCenter;
-
 class MediaStream final : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamPrivateClient, public EventTargetWithInlineData, public ContextDestructionObserver {
 public:
     class Observer {
index 3b5cf7c..d90d585 100644 (file)
 #include "MediaConstraintsImpl.h"
 #include "MediaSourceStates.h"
 #include "MediaStream.h"
-#include "MediaStreamCenter.h"
 #include "MediaStreamPrivate.h"
 #include "MediaStreamTrackSourcesCallback.h"
 #include "MediaStreamTrackSourcesRequest.h"
 #include "MediaTrackConstraints.h"
 #include "NotImplemented.h"
+#include "RealtimeMediaSourceCenter.h"
 #include "VideoStreamTrack.h"
 #include <wtf/Functional.h>
 #include <wtf/NeverDestroyed.h>
@@ -151,7 +151,7 @@ const AtomicString& MediaStreamTrack::readyState() const
 void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback, ExceptionCode& ec)
 {
     RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequest::create(context, callback);
-    if (!MediaStreamCenter::singleton().getMediaStreamTrackSources(request.release()))
+    if (!RealtimeMediaSourceCenter::singleton().getMediaStreamTrackSources(request.release()))
         ec = NOT_SUPPORTED_ERR;
 }
 
index c532d78..99abe50 100644 (file)
@@ -43,8 +43,8 @@
 #include "Frame.h"
 #include "MediaConstraintsImpl.h"
 #include "MediaStream.h"
-#include "MediaStreamCenter.h"
 #include "MediaStreamPrivate.h"
+#include "RealtimeMediaSourceCenter.h"
 #include "SecurityOrigin.h"
 #include "UserMediaController.h"
 #include <wtf/Functional.h>
@@ -114,7 +114,7 @@ void UserMediaRequest::start()
 {
     // 1 - make sure the system is capable of supporting the audio and video constraints. We don't want to ask for
     // user permission if the constraints can not be suported.
-    MediaStreamCenter::singleton().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
+    RealtimeMediaSourceCenter::singleton().validateRequestConstraints(this, m_audioConstraints, m_videoConstraints);
 }
 
     
@@ -133,7 +133,7 @@ void UserMediaRequest::userMediaAccessGranted()
     RefPtr<UserMediaRequest> protectedThis(this);
     callOnMainThread([protectedThis] {
         // 3 - the user granted access, ask platform to create the media stream descriptors.
-        MediaStreamCenter::singleton().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
+        RealtimeMediaSourceCenter::singleton().createMediaStream(protectedThis.get(), protectedThis->m_audioConstraints, protectedThis->m_videoConstraints);
     });
 }
 
index 9cd4a27..0100dac 100644 (file)
                078E092E17D14D1C00420AA1 /* UserMediaClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B8D17CEC32700848E51 /* UserMediaClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                078E092F17D14D1C00420AA1 /* UserMediaController.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B8F17CEC32700848E51 /* UserMediaController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                078E093017D14D1C00420AA1 /* UserMediaRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9117CEC32700848E51 /* UserMediaRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               078E093117D1684200420AA1 /* MediaStreamCenterMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0729B14E17CFCCA0004F1D60 /* MediaStreamCenterMac.cpp */; };
-               078E093217D1684600420AA1 /* MediaStreamCenterMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0729B14F17CFCCA0004F1D60 /* MediaStreamCenterMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               078E093317D16B0600420AA1 /* MediaStreamCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */; };
-               078E093417D16B0B00420AA1 /* MediaStreamCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                078E093717D16B2C00420AA1 /* MediaStreamPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                078E093A17D16E1C00420AA1 /* MediaConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B9917CF0AD400848E51 /* MediaConstraints.h */; settings = {ATTRIBUTES = (Private, ); }; };
                07C59B5E17F4B208000FBCBB /* JSAudioStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */; };
                07C59B5F17F4B208000FBCBB /* JSVideoStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */; };
                07C59B6017F4B208000FBCBB /* JSVideoStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */; };
-               07C59B6317F4D1BF000FBCBB /* MockMediaStreamCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B6117F4CF87000FBCBB /* MockMediaStreamCenter.cpp */; };
-               07C59B6417F4D1C4000FBCBB /* MockMediaStreamCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B6217F4CF87000FBCBB /* MockMediaStreamCenter.h */; };
                07C59B6817F784BA000FBCBB /* MediaSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B6517F784BA000FBCBB /* MediaSourceStates.cpp */; };
                07C59B6917F784BA000FBCBB /* MediaSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B6617F784BA000FBCBB /* MediaSourceStates.h */; };
                07C59B6E17F794F6000FBCBB /* JSMediaSourceStatesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B6D17F794F6000FBCBB /* JSMediaSourceStatesCustom.cpp */; };
                49FFBF4011C93EE3006A7118 /* WebGLLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */; };
                4A0DA2FE129B241900AB61E1 /* FormAssociatedElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */; };
                4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4A0FFA9D1AAF5E750062803B /* MockRealtimeMediaSourceCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */; };
+               4A0FFA9E1AAF5E7E0062803B /* MockRealtimeMediaSourceCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */; };
+               4A0FFAA11AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0FFA9F1AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp */; };
+               4A0FFAA21AAF5EA20062803B /* RealtimeMediaSourceCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0FFAA01AAF5EA20062803B /* RealtimeMediaSourceCenter.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               4A0FFAA51AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A0FFAA31AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp */; };
+               4A0FFAA61AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A0FFAA41AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4A38BF5014FE1C0900612512 /* WebSocketDeflateFramer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A38BF4E14FE1C0900612512 /* WebSocketDeflateFramer.cpp */; };
                4A38BF5114FE1C0900612512 /* WebSocketDeflateFramer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A38BF4F14FE1C0900612512 /* WebSocketDeflateFramer.h */; };
                4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */; };
                07221B9017CEC32700848E51 /* UserMediaRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMediaRequest.cpp; sourceTree = "<group>"; };
                07221B9117CEC32700848E51 /* UserMediaRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMediaRequest.h; sourceTree = "<group>"; };
                07221B9917CF0AD400848E51 /* MediaConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaConstraints.h; sourceTree = "<group>"; };
-               07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamCenter.cpp; sourceTree = "<group>"; };
-               07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCenter.h; sourceTree = "<group>"; };
                07221B9D17CF0AD400848E51 /* MediaStreamPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamPrivate.h; sourceTree = "<group>"; };
                07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCreationClient.h; sourceTree = "<group>"; };
                07221BA217CF0AD400848E51 /* RTCDataChannelHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannelHandler.h; sourceTree = "<group>"; };
                07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackEvent.h; sourceTree = "<group>"; };
                072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; };
                072847E316EBC5B00043CFA4 /* PlatformTextTrackMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrackMenu.h; sourceTree = "<group>"; };
-               0729B14E17CFCCA0004F1D60 /* MediaStreamCenterMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamCenterMac.cpp; sourceTree = "<group>"; };
-               0729B14F17CFCCA0004F1D60 /* MediaStreamCenterMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamCenterMac.h; sourceTree = "<group>"; };
                072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PluginReplacement.h; path = plugins/PluginReplacement.h; sourceTree = "<group>"; };
                072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = QuickTimePluginReplacement.mm; path = plugins/QuickTimePluginReplacement.mm; sourceTree = "<group>"; };
                072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = QuickTimePluginReplacement.css; path = plugins/QuickTimePluginReplacement.css; sourceTree = "<group>"; };
                07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioStreamTrack.h; sourceTree = "<group>"; };
                07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSVideoStreamTrack.cpp; sourceTree = "<group>"; };
                07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVideoStreamTrack.h; sourceTree = "<group>"; };
-               07C59B6117F4CF87000FBCBB /* MockMediaStreamCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockMediaStreamCenter.cpp; sourceTree = "<group>"; };
-               07C59B6217F4CF87000FBCBB /* MockMediaStreamCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockMediaStreamCenter.h; sourceTree = "<group>"; };
                07C59B6517F784BA000FBCBB /* MediaSourceStates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSourceStates.cpp; sourceTree = "<group>"; };
                07C59B6617F784BA000FBCBB /* MediaSourceStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourceStates.h; sourceTree = "<group>"; };
                07C59B6717F784BA000FBCBB /* MediaSourceStates.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaSourceStates.idl; sourceTree = "<group>"; };
                49FFBF3E11C93EE3006A7118 /* WebGLLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebGLLayer.mm; sourceTree = "<group>"; };
                4A0DA2FC129B241900AB61E1 /* FormAssociatedElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormAssociatedElement.cpp; sourceTree = "<group>"; };
                4A0DA2FD129B241900AB61E1 /* FormAssociatedElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormAssociatedElement.h; sourceTree = "<group>"; };
+               4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockRealtimeMediaSourceCenter.cpp; sourceTree = "<group>"; };
+               4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockRealtimeMediaSourceCenter.h; sourceTree = "<group>"; };
+               4A0FFA9F1AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeMediaSourceCenter.cpp; sourceTree = "<group>"; };
+               4A0FFAA01AAF5EA20062803B /* RealtimeMediaSourceCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeMediaSourceCenter.h; sourceTree = "<group>"; };
+               4A0FFAA31AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RealtimeMediaSourceCenterMac.cpp; sourceTree = "<group>"; };
+               4A0FFAA41AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RealtimeMediaSourceCenterMac.h; sourceTree = "<group>"; };
                4A38BF4E14FE1C0900612512 /* WebSocketDeflateFramer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketDeflateFramer.cpp; sourceTree = "<group>"; };
                4A38BF4F14FE1C0900612512 /* WebSocketDeflateFramer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketDeflateFramer.h; sourceTree = "<group>"; };
                4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentRuleSets.cpp; sourceTree = "<group>"; };
                07221B9217CF0AD400848E51 /* mediastream */ = {
                        isa = PBXGroup;
                        children = (
+                               4A0FFA9F1AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp */,
+                               4A0FFAA01AAF5EA20062803B /* RealtimeMediaSourceCenter.h */,
                                4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */,
                                4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */,
                                4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */,
                                4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */,
                                0729B14D17CFCCA0004F1D60 /* mac */,
                                07221B9917CF0AD400848E51 /* MediaConstraints.h */,
-                               07221B9A17CF0AD400848E51 /* MediaStreamCenter.cpp */,
-                               07221B9B17CF0AD400848E51 /* MediaStreamCenter.h */,
                                070F549717F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h */,
                                07221BA017CF0AD400848E51 /* MediaStreamCreationClient.h */,
                                0711588F17DF633700EDFE2B /* MediaStreamPrivate.cpp */,
                0729B14D17CFCCA0004F1D60 /* mac */ = {
                        isa = PBXGroup;
                        children = (
+                               4A0FFAA31AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp */,
+                               4A0FFAA41AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h */,
                                070363D8181A1CDC00C074A5 /* AVAudioCaptureSource.h */,
                                070363D9181A1CDC00C074A5 /* AVAudioCaptureSource.mm */,
                                070363DA181A1CDC00C074A5 /* AVCaptureDeviceManager.h */,
                                070363DD181A1CDC00C074A5 /* AVMediaCaptureSource.mm */,
                                070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */,
                                070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */,
-                               0729B14E17CFCCA0004F1D60 /* MediaStreamCenterMac.cpp */,
-                               0729B14F17CFCCA0004F1D60 /* MediaStreamCenterMac.h */,
                        );
                        path = mac;
                        sourceTree = "<group>";
                59C77F101054591C00506104 /* mock */ = {
                        isa = PBXGroup;
                        children = (
+                               4A0FFA9B1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.cpp */,
+                               4A0FFA9C1AAF5E6C0062803B /* MockRealtimeMediaSourceCenter.h */,
                                CDF2B005182053DF00F2B424 /* mediasource */,
                                59309A1011F4AE5800250603 /* DeviceOrientationClientMock.cpp */,
                                59309A1211F4AE6A00250603 /* DeviceOrientationClientMock.h */,
                                073794DF19EE2D1B00E5A045 /* MediaConstraintsMock.cpp */,
                                073794E019EE2D1B00E5A045 /* MediaConstraintsMock.h */,
-                               07C59B6117F4CF87000FBCBB /* MockMediaStreamCenter.cpp */,
-                               07C59B6217F4CF87000FBCBB /* MockMediaStreamCenter.h */,
                                AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */,
                                AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */,
                                073794F319F5864E00E5A045 /* RTCDataChannelHandlerMock.cpp */,
                                E1FE136B183FE1AB00892F13 /* CryptoAlgorithmRSA_OAEP.h in Headers */,
                                E1233F0D185A3E3B008DFAF5 /* CryptoAlgorithmRSAES_PKCS1_v1_5.h in Headers */,
                                E1BD331E182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h in Headers */,
+                               4A0FFAA61AAF5EF60062803B /* RealtimeMediaSourceCenterMac.h in Headers */,
                                E1C266DB18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h in Headers */,
                                E1FE1377184D1E3300892F13 /* CryptoAlgorithmRsaOaepParams.h in Headers */,
                                E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */,
                                45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */,
                                A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
                                CECCFC3B141973D5002A0AC1 /* DecodeEscapeSequences.h in Headers */,
+                               4A0FFAA21AAF5EA20062803B /* RealtimeMediaSourceCenter.h in Headers */,
                                4162A451101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h in Headers */,
                                41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */,
                                FD06DFA6134A4DEF006F5D7D /* DefaultAudioDestinationNode.h in Headers */,
                                0783228518013ED800999E0C /* MediaStreamAudioSource.h in Headers */,
                                FD671A78159BB07000197559 /* MediaStreamAudioSourceNode.h in Headers */,
                                0705850B17FA4827005F2BCB /* MediaStreamCapabilities.h in Headers */,
-                               078E093417D16B0B00420AA1 /* MediaStreamCenter.h in Headers */,
-                               078E093217D1684600420AA1 /* MediaStreamCenterMac.h in Headers */,
                                070F549817F12F6B00169E04 /* MediaStreamConstraintsValidationClient.h in Headers */,
                                078E093917D16B2C00420AA1 /* MediaStreamCreationClient.h in Headers */,
                                078E091617D14D1C00420AA1 /* MediaStreamEvent.h in Headers */,
                                CDF2B0111820540600F2B424 /* MockBox.h in Headers */,
                                CDF2B0131820540600F2B424 /* MockMediaPlayerMediaSource.h in Headers */,
                                CDF2B0151820540600F2B424 /* MockMediaSourcePrivate.h in Headers */,
-                               07C59B6417F4D1C4000FBCBB /* MockMediaStreamCenter.h in Headers */,
                                CDF2B0171820540700F2B424 /* MockSourceBufferPrivate.h in Headers */,
                                CDF2B0191820540700F2B424 /* MockTracks.h in Headers */,
                                C6D74AD509AA282E000B0A52 /* ModifySelectionListLevel.h in Headers */,
                                1AB7FC7D0A8B92EC00D9D37B /* XPathPredicate.h in Headers */,
                                1AB7FC7F0A8B92EC00D9D37B /* XPathResult.h in Headers */,
                                1AB7FC820A8B92EC00D9D37B /* XPathStep.h in Headers */,
+                               4A0FFA9E1AAF5E7E0062803B /* MockRealtimeMediaSourceCenter.h in Headers */,
                                1AB7FC840A8B92EC00D9D37B /* XPathUtil.h in Headers */,
                                1AB7FC860A8B92EC00D9D37B /* XPathValue.h in Headers */,
                                1AB7FC880A8B92EC00D9D37B /* XPathVariableReference.h in Headers */,
                                9766504F144FBFFE00F6BB51 /* EventFactory.cpp in Sources */,
                                93C09A810B064F00005ABD4D /* EventHandler.cpp in Sources */,
                                FE6938B61045D67E008EABB6 /* EventHandlerIOS.mm in Sources */,
+                               4A0FFAA11AAF5EA20062803B /* RealtimeMediaSourceCenter.cpp in Sources */,
                                93C09A7F0B064EEF005ABD4D /* EventHandlerMac.mm in Sources */,
                                AD4495F3141FC08900541EDF /* EventListenerMap.cpp in Sources */,
                                C400D10918F1C8F60090D863 /* EventLoopInput.cpp in Sources */,
                                0783228418013ED800999E0C /* MediaStreamAudioSource.cpp in Sources */,
                                FD671A77159BB07000197559 /* MediaStreamAudioSourceNode.cpp in Sources */,
                                0705851517FB0EEA005F2BCB /* MediaStreamCapabilities.cpp in Sources */,
-                               078E093317D16B0600420AA1 /* MediaStreamCenter.cpp in Sources */,
-                               078E093117D1684200420AA1 /* MediaStreamCenterMac.cpp in Sources */,
                                078E090017D14CEE00420AA1 /* MediaStreamEvent.cpp in Sources */,
                                0711589117DF6F6600EDFE2B /* MediaStreamPrivate.cpp in Sources */,
                                078E090117D14CEE00420AA1 /* MediaStreamRegistry.cpp in Sources */,
                                724ED3311A3A8B2300F5F13C /* JSEXTBlendMinMax.cpp in Sources */,
                                CDF2B0121820540600F2B424 /* MockMediaPlayerMediaSource.cpp in Sources */,
                                CDF2B0141820540600F2B424 /* MockMediaSourcePrivate.cpp in Sources */,
-                               07C59B6317F4D1BF000FBCBB /* MockMediaStreamCenter.cpp in Sources */,
                                CDF2B0161820540700F2B424 /* MockSourceBufferPrivate.cpp in Sources */,
                                CDF2B0181820540700F2B424 /* MockTracks.cpp in Sources */,
                                C6D74AE409AA290A000B0A52 /* ModifySelectionListLevel.cpp in Sources */,
                                AA2A5ACD16A485FA00975A25 /* SpeechSynthesisVoice.cpp in Sources */,
                                A78FE13B12366B1000ACE8D0 /* SpellChecker.cpp in Sources */,
                                B8DBDB4D130B0F8A00F5CDB1 /* SpellingCorrectionCommand.cpp in Sources */,
+                               4A0FFAA51AAF5EF60062803B /* RealtimeMediaSourceCenterMac.cpp in Sources */,
                                4512502215DCE37D002F84E2 /* SpinButtonElement.cpp in Sources */,
                                93309E11099E64920056E581 /* SplitElementCommand.cpp in Sources */,
                                93309E13099E64920056E581 /* SplitTextNodeCommand.cpp in Sources */,
                                F55B3DDB1251F12D003EF269 /* TimeInputType.cpp in Sources */,
                                7553CFE9108F473F00EA281E /* TimelineRecordFactory.cpp in Sources */,
                                93309EA4099EB78C0056E581 /* Timer.cpp in Sources */,
+                               4A0FFA9D1AAF5E750062803B /* MockRealtimeMediaSourceCenter.cpp in Sources */,
                                585D6E031A1A792E00FA4F12 /* SimpleLineLayoutFlowContents.cpp in Sources */,
                                E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */,
                                A1DE71321861322200734192 /* TouchConstructors.cpp in Sources */,
index a59862f..9e27352 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "MediaStreamPrivate.h"
 
-#include "MediaStreamCenter.h"
 #include "UUID.h"
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
index 30c3567..b236d91 100644 (file)
@@ -35,7 +35,6 @@
 #if ENABLE(MEDIA_STREAM)
 #include "RealtimeMediaSource.h"
 
-#include "MediaStreamCenter.h"
 #include "RealtimeMediaSourceCapabilities.h"
 #include "UUID.h"
 
 #include "config.h"
 
 #if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamCenter.h"
+#include "RealtimeMediaSourceCenter.h"
 
 #include "MediaStreamPrivate.h"
 
 namespace WebCore {
 
-static MediaStreamCenter*& mediaStreamCenterOverride()
+static RealtimeMediaSourceCenter*& mediaStreamCenterOverride()
 {
-    static MediaStreamCenter* override;
+    static RealtimeMediaSourceCenter* override;
     return override;
 }
 
-MediaStreamCenter& MediaStreamCenter::singleton()
+RealtimeMediaSourceCenter& RealtimeMediaSourceCenter::singleton()
 {
-    MediaStreamCenter* override = mediaStreamCenterOverride();
+    RealtimeMediaSourceCenter* override = mediaStreamCenterOverride();
     if (override)
         return *override;
     
-    return MediaStreamCenter::platformCenter();
+    return RealtimeMediaSourceCenter::platformCenter();
 }
 
-void MediaStreamCenter::setSharedStreamCenter(MediaStreamCenter* center)
+void RealtimeMediaSourceCenter::setSharedStreamCenter(RealtimeMediaSourceCenter* center)
 {
     mediaStreamCenterOverride() = center;
 }
 
-MediaStreamCenter::MediaStreamCenter()
+RealtimeMediaSourceCenter::RealtimeMediaSourceCenter()
 {
 }
 
-MediaStreamCenter::~MediaStreamCenter()
+RealtimeMediaSourceCenter::~RealtimeMediaSourceCenter()
 {
 }
 
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MediaStreamCenter_h
-#define MediaStreamCenter_h
+#ifndef RealtimeMediaSourceCenter_h
+#define RealtimeMediaSourceCenter_h
 
 #if ENABLE(MEDIA_STREAM)
 
@@ -45,12 +45,12 @@ class MediaStreamCreationClient;
 class RealtimeMediaSourceStates;
 class MediaStreamTrackSourcesRequestClient;
 
-class MediaStreamCenter {
+class RealtimeMediaSourceCenter {
 public:
-    virtual ~MediaStreamCenter();
+    virtual ~RealtimeMediaSourceCenter();
 
-    static MediaStreamCenter& singleton();
-    static void setSharedStreamCenter(MediaStreamCenter*);
+    static RealtimeMediaSourceCenter& singleton();
+    static void setSharedStreamCenter(RealtimeMediaSourceCenter*);
 
     virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints) = 0;
 
@@ -59,13 +59,13 @@ public:
     virtual bool getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient>) = 0;
 
 protected:
-    MediaStreamCenter();
+    RealtimeMediaSourceCenter();
 
-    static MediaStreamCenter& platformCenter();
+    static RealtimeMediaSourceCenter& platformCenter();
 };
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)
 
-#endif // MediaStreamCenter_h
+#endif // RealtimeMediaSourceCenter_h
index 70a3190..5bf104e 100644 (file)
@@ -44,7 +44,7 @@
 
 namespace WebCore {
 
-MediaStreamCenter& MediaStreamCenter::platformCenter()
+RealtimeMediaSourceCenter& RealtimeMediaSourceCenter::platformCenter()
 {
     ASSERT(isMainThread());
     DEPRECATED_DEFINE_STATIC_LOCAL(MediaStreamCenterGStreamer, center, ());
index ed566ca..8af13cf 100644 (file)
@@ -34,7 +34,7 @@
 
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamCenter.h"
+#include "RealtimeMediaSourceCenter.h"
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -45,7 +45,7 @@ class MediaStreamPrivate;
 class RealtimeMediaSource;
 class MediaStreamSourcesQueryClient;
 
-class MediaStreamCenterGStreamer : public MediaStreamCenter {
+class MediaStreamCenterGStreamer : public RealtimeMediaSourceCenter {
 public:
     MediaStreamCenterGStreamer();
     ~MediaStreamCenterGStreamer();
index ce90617..dd8e554 100644 (file)
@@ -28,7 +28,6 @@
 
 #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
 
-#include "MediaStreamCenter.h"
 #include "MediaStreamTrackSourcesRequestClient.h"
 #include "RealtimeMediaSource.h"
 #include <wtf/RetainPtr.h>
@@ -31,8 +31,7 @@
 #include "config.h"
 
 #if ENABLE(MEDIA_STREAM)
-
-#include "MediaStreamCenterMac.h"
+#include "RealtimeMediaSourceCenterMac.h"
 
 #include "AVCaptureDeviceManager.h"
 #include "MediaStreamCreationClient.h"
 
 namespace WebCore {
 
-MediaStreamCenter& MediaStreamCenter::platformCenter()
+RealtimeMediaSourceCenter& RealtimeMediaSourceCenter::platformCenter()
 {
     ASSERT(isMainThread());
-    DEPRECATED_DEFINE_STATIC_LOCAL(MediaStreamCenterMac, center, ());
+    DEPRECATED_DEFINE_STATIC_LOCAL(RealtimeMediaSourceCenterMac, center, ());
     return center;
 }
 
-MediaStreamCenterMac::MediaStreamCenterMac()
+RealtimeMediaSourceCenterMac::RealtimeMediaSourceCenterMac()
 {
 }
 
-MediaStreamCenterMac::~MediaStreamCenterMac()
+RealtimeMediaSourceCenterMac::~RealtimeMediaSourceCenterMac()
 {
 }
 
-void MediaStreamCenterMac::validateRequestConstraints(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
+void RealtimeMediaSourceCenterMac::validateRequestConstraints(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
 {
     RefPtr<MediaStreamCreationClient> client = prpQueryClient;
     
@@ -84,7 +83,7 @@ void MediaStreamCenterMac::validateRequestConstraints(PassRefPtr<MediaStreamCrea
     client->constraintsValidated();
 }
     
-void MediaStreamCenterMac::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
+void RealtimeMediaSourceCenterMac::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
 {
     RefPtr<MediaStreamCreationClient> client = prpQueryClient;
     
@@ -124,7 +123,7 @@ void MediaStreamCenterMac::createMediaStream(PassRefPtr<MediaStreamCreationClien
     client->didCreateStream(MediaStreamPrivate::create(audioSources, videoSources));
 }
 
-bool MediaStreamCenterMac::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient> prpClient)
+bool RealtimeMediaSourceCenterMac::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient> prpClient)
 {
     RefPtr<MediaStreamTrackSourcesRequestClient> requestClient = prpClient;
 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MediaStreamCenterMac_h
-#define MediaStreamCenterMac_h
+#ifndef RealtimeMediaSourceCenterMac_h
+#define RealtimeMediaSourceCenterMac_h
 
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamCenter.h"
-
 #include "RealtimeMediaSource.h"
+#include "RealtimeMediaSourceCenter.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
-class MediaStreamCenterMac final : public MediaStreamCenter {
+class RealtimeMediaSourceCenterMac final : public RealtimeMediaSourceCenter {
 public:
-    MediaStreamCenterMac();
-    ~MediaStreamCenterMac();
+    RealtimeMediaSourceCenterMac();
+    ~RealtimeMediaSourceCenterMac();
 
     virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
     virtual void createMediaStream(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
@@ -55,4 +54,4 @@ public:
 
 #endif // ENABLE(MEDIA_STREAM)
 
-#endif // MediaStreamCenterMac_h
+#endif // RealtimeMediaSourceCenterMac_h
@@ -28,8 +28,7 @@
 #include "config.h"
 
 #if ENABLE(MEDIA_STREAM)
-
-#include "MockMediaStreamCenter.h"
+#include "MockRealtimeMediaSourceCenter.h"
 
 #include "MediaConstraintsMock.h"
 #include "MediaStream.h"
@@ -117,18 +116,18 @@ static void initializeMockSources()
     mockSourceMap().add(mockSource2id, mockSource2.release());
 }
 
-void MockMediaStreamCenter::registerMockMediaStreamCenter()
+void MockRealtimeMediaSourceCenter::registerMockRealtimeMediaSourceCenter()
 {
-    DEPRECATED_DEFINE_STATIC_LOCAL(MockMediaStreamCenter, center, ());
+    DEPRECATED_DEFINE_STATIC_LOCAL(MockRealtimeMediaSourceCenter, center, ());
     static bool registered = false;
     if (!registered) {
         registered = true;
-        MediaStreamCenter::setSharedStreamCenter(&center);
+        RealtimeMediaSourceCenter::setSharedStreamCenter(&center);
         initializeMockSources();
     }
 }
 
-void MockMediaStreamCenter::validateRequestConstraints(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
+void MockRealtimeMediaSourceCenter::validateRequestConstraints(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
 {
     RefPtr<MediaStreamCreationClient> client = prpQueryClient;
     
@@ -153,7 +152,7 @@ void MockMediaStreamCenter::validateRequestConstraints(PassRefPtr<MediaStreamCre
     client->constraintsValidated();
 }
 
-void MockMediaStreamCenter::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
+void MockRealtimeMediaSourceCenter::createMediaStream(PassRefPtr<MediaStreamCreationClient> prpQueryClient, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints)
 {
     RefPtr<MediaStreamCreationClient> client = prpQueryClient;
 
@@ -198,7 +197,7 @@ void MockMediaStreamCenter::createMediaStream(PassRefPtr<MediaStreamCreationClie
     client->didCreateStream(MediaStreamPrivate::create(audioSources, videoSources));
 }
 
-bool MockMediaStreamCenter::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient> prpClient)
+bool MockRealtimeMediaSourceCenter::getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient> prpClient)
 {
     RefPtr<MediaStreamTrackSourcesRequestClient> requestClient = prpClient;
     Vector<RefPtr<TrackSourceInfo>> sources;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MockMediaStreamCenter_h
-#define MockMediaStreamCenter_h
+#ifndef MockRealtimeMediaSourceCenter_h
+#define MockRealtimeMediaSourceCenter_h
 
 #if ENABLE(MEDIA_STREAM)
 
-#include "MediaStreamCenter.h"
+#include "RealtimeMediaSourceCenter.h"
 
 namespace WebCore {
 
-class MockMediaStreamCenter final : public MediaStreamCenter {
+class MockRealtimeMediaSourceCenter final : public RealtimeMediaSourceCenter {
 public:
-    WEBCORE_EXPORT static void registerMockMediaStreamCenter();
+    WEBCORE_EXPORT static void registerMockRealtimeMediaSourceCenter();
 
     virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
     virtual void createMediaStream(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
     virtual bool getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient>) override;
 
 private:
-    MockMediaStreamCenter() { }
+    MockRealtimeMediaSourceCenter() { }
 };
 
 }
 
-#endif // MockMediaStreamCenter_h
+#endif // MockRealtimeMediaSourceCenter_h
 
 #endif
index d283f92..aadaadd 100644 (file)
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-#include "MockMediaStreamCenter.h"
+#include "MockRealtimeMediaSourceCenter.h"
 #include "RTCPeerConnection.h"
 #include "RTCPeerConnectionHandlerMock.h"
 #include "UserMediaClientMock.h"
@@ -333,7 +333,7 @@ Internals::Internals(Document* document)
 #endif
 
 #if ENABLE(MEDIA_STREAM)
-    MockMediaStreamCenter::registerMockMediaStreamCenter();
+    MockRealtimeMediaSourceCenter::registerMockRealtimeMediaSourceCenter();
     enableMockRTCPeerConnectionHandler();
     WebCore::provideUserMediaTo(document->page(), new UserMediaClientMock());
 #endif