Changeset 182627 in webkit
- Timestamp:
- Apr 10, 2015 3:48:47 AM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r182545 r182627 222 222 Modules/mediastream/AllAudioCapabilities.idl 223 223 Modules/mediastream/AllVideoCapabilities.idl 224 Modules/mediastream/AudioStreamTrack.idl225 224 Modules/mediastream/CapabilityRange.idl 226 225 Modules/mediastream/DOMURLMediaStream.idl … … 258 257 Modules/mediastream/RTCStatsResponse.idl 259 258 Modules/mediastream/SourceInfo.idl 260 Modules/mediastream/VideoStreamTrack.idl261 259 262 260 Modules/navigatorcontentutils/NavigatorContentUtils.idl … … 872 870 Modules/mediasource/VideoPlaybackQuality.cpp 873 871 874 Modules/mediastream/AudioStreamTrack.cpp875 872 Modules/mediastream/CapabilityRange.cpp 876 873 Modules/mediastream/DOMURLMediaStream.cpp … … 909 906 Modules/mediastream/UserMediaController.cpp 910 907 Modules/mediastream/UserMediaRequest.cpp 911 Modules/mediastream/VideoStreamTrack.cpp912 908 913 909 Modules/navigatorcontentutils/NavigatorContentUtils.cpp -
trunk/Source/WebCore/ChangeLog
r182623 r182627 1 2015-04-10 Adam Bergkvist <adam.bergkvist@ericsson.com> 2 3 WebRTC: Remove AudioStreamTrack and VideoStreamTrack (removed in spec) 4 https://bugs.webkit.org/show_bug.cgi?id=143336 5 6 Reviewed by Philippe Normand. 7 8 The specific MediaStreamTrakc types (AudioStreamTrack and VideoStreamTrack) have been 9 removed from the Media Capture and Streams [1] specification. 10 11 [1] http://w3c.github.io/mediacapture-main/archives/20150324/getusermedia.html 12 13 There are no test for this feature to remove. 14 15 * CMakeLists.txt: 16 * DerivedSources.make: 17 * Modules/mediastream/AudioStreamTrack.cpp: Removed. 18 * Modules/mediastream/AudioStreamTrack.h: Removed. 19 * Modules/mediastream/AudioStreamTrack.idl: Removed. 20 * Modules/mediastream/MediaStream.cpp: 21 (WebCore::MediaStream::MediaStream): 22 (WebCore::MediaStream::addRemoteTrack): 23 (WebCore::MediaStream::active): Deleted. 24 * Modules/mediastream/MediaStreamTrack.cpp: 25 (WebCore::MediaStreamTrack::create): 26 (WebCore::MediaStreamTrack::MediaStreamTrack): 27 (WebCore::MediaStreamTrack::kind): 28 (WebCore::MediaStreamTrack::clone): 29 (WebCore::MediaStreamTrack::trackEnded): Deleted. 30 * Modules/mediastream/MediaStreamTrack.h: 31 * Modules/mediastream/VideoStreamTrack.cpp: Removed. 32 * Modules/mediastream/VideoStreamTrack.h: Removed. 33 * Modules/mediastream/VideoStreamTrack.idl: Removed. 34 * WebCore.xcodeproj/project.pbxproj: 35 1 36 2015-04-09 Andy Estes <aestes@apple.com> 2 37 -
trunk/Source/WebCore/DerivedSources.make
r182275 r182627 116 116 $(WebCore)/Modules/mediastream/AllVideoCapabilities.idl \ 117 117 $(WebCore)/Modules/mediastream/AllAudioCapabilities.idl \ 118 $(WebCore)/Modules/mediastream/AudioStreamTrack.idl \119 118 $(WebCore)/Modules/mediastream/CapabilityRange.idl \ 120 119 $(WebCore)/Modules/mediastream/HTMLMediaElementMediaStream.idl \ … … 150 149 $(WebCore)/Modules/mediastream/RTCStatsReport.idl \ 151 150 $(WebCore)/Modules/mediastream/RTCStatsResponse.idl \ 152 $(WebCore)/Modules/mediastream/VideoStreamTrack.idl \153 151 $(WebCore)/Modules/mediastream/SourceInfo.idl \ 154 152 $(WebCore)/Modules/notifications/DOMWindowNotifications.idl \ -
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
r181371 r182627 31 31 #if ENABLE(MEDIA_STREAM) 32 32 33 #include "AudioStreamTrack.h"34 33 #include "Event.h" 35 34 #include "ExceptionCode.h" … … 37 36 #include "MediaStreamTrackEvent.h" 38 37 #include "RealtimeMediaSource.h" 39 #include "VideoStreamTrack.h"40 38 #include <wtf/NeverDestroyed.h> 41 39 … … 95 93 m_audioTracks.reserveCapacity(numberOfAudioTracks); 96 94 for (size_t i = 0; i < numberOfAudioTracks; i++) { 97 track = AudioStreamTrack::create(context, *m_private->audioTracks(i));95 track = MediaStreamTrack::create(context, *m_private->audioTracks(i)); 98 96 track->addObserver(this); 99 97 m_audioTracks.append(track.release()); … … 103 101 m_videoTracks.reserveCapacity(numberOfVideoTracks); 104 102 for (size_t i = 0; i < numberOfVideoTracks; i++) { 105 track = VideoStreamTrack::create(context, *m_private->videoTracks(i));103 track = MediaStreamTrack::create(context, *m_private->videoTracks(i)); 106 104 track->addObserver(this); 107 105 m_videoTracks.append(track.release()); … … 325 323 switch (privateTrack->type()) { 326 324 case RealtimeMediaSource::Audio: 327 track = AudioStreamTrack::create(*scriptExecutionContext(), *privateTrack);328 break;329 325 case RealtimeMediaSource::Video: 330 track = VideoStreamTrack::create(*scriptExecutionContext(), *privateTrack);326 track = MediaStreamTrack::create(*scriptExecutionContext(), *privateTrack); 331 327 break; 332 328 case RealtimeMediaSource::None: -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
r182544 r182627 33 33 #include "AllAudioCapabilities.h" 34 34 #include "AllVideoCapabilities.h" 35 #include "AudioStreamTrack.h"36 35 #include "Dictionary.h" 37 36 #include "Event.h" … … 47 46 #include "NotImplemented.h" 48 47 #include "RealtimeMediaSourceCenter.h" 49 #include "VideoStreamTrack.h"50 48 #include <wtf/Functional.h> 51 49 #include <wtf/NeverDestroyed.h> … … 53 51 namespace WebCore { 54 52 55 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack, const Dictionary* constraints) 53 RefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack) 54 { 55 return adoptRef(new MediaStreamTrack(context, privateTrack)); 56 } 57 58 RefPtr<MediaStreamTrack> MediaStreamTrack::create(MediaStreamTrack& track) 59 { 60 return adoptRef(new MediaStreamTrack(track)); 61 } 62 63 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, MediaStreamTrackPrivate& privateTrack) 56 64 : RefCounted() 57 65 , ActiveDOMObject(&context) … … 63 71 64 72 m_privateTrack->setClient(this); 65 66 if (constraints)67 applyConstraints(*constraints);68 73 } 69 74 … … 88 93 { 89 94 m_privateTrack->setSource(newSource); 95 } 96 97 const AtomicString& MediaStreamTrack::kind() const 98 { 99 static NeverDestroyed<AtomicString> audioKind("audio", AtomicString::ConstructFromLiteral); 100 static NeverDestroyed<AtomicString> videoKind("video", AtomicString::ConstructFromLiteral); 101 102 if (m_privateTrack->type() == RealtimeMediaSource::Audio) 103 return audioKind; 104 return videoKind; 90 105 } 91 106 … … 195 210 RefPtr<MediaStreamTrack> MediaStreamTrack::clone() 196 211 { 197 if (m_privateTrack->type() == RealtimeMediaSource::Audio) 198 return AudioStreamTrack::create(*this); 199 200 return VideoStreamTrack::create(*this); 212 return MediaStreamTrack::create(*this); 201 213 } 202 214 -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
r182544 r182627 50 50 class MediaTrackConstraints; 51 51 52 class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamTrackPrivateClient {52 class MediaStreamTrack final : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamTrackPrivateClient { 53 53 public: 54 54 class Observer { … … 58 58 }; 59 59 60 static RefPtr<MediaStreamTrack> create(ScriptExecutionContext&, MediaStreamTrackPrivate&); 61 static RefPtr<MediaStreamTrack> create(MediaStreamTrack&); 60 62 virtual ~MediaStreamTrack(); 61 63 62 virtual const AtomicString& kind() const = 0;64 const AtomicString& kind() const; 63 65 const String& id() const; 64 66 const String& label() const; … … 100 102 using RefCounted<MediaStreamTrack>::deref; 101 103 102 protected: 104 private: 105 MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&); 103 106 explicit MediaStreamTrack(MediaStreamTrack&); 104 MediaStreamTrack(ScriptExecutionContext&, MediaStreamTrackPrivate&, const Dictionary*);105 107 106 108 void setSource(PassRefPtr<RealtimeMediaSource>); 107 109 108 private:109 110 void configureTrackRendering(); 110 111 void trackDidEnd(); -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r182486 r182627 325 325 07B5A30D14687D7100A81ECE /* JSTextTrackListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B5A30C14687D7100A81ECE /* JSTextTrackListCustom.cpp */; }; 326 326 07BDD6EC1469B4C2009C9F85 /* JSTrackEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07B5A30A14687B8400A81ECE /* JSTrackEventCustom.cpp */; }; 327 07C59B5317F4AC15000FBCBB /* AudioStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */; };328 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */; };329 07C59B5617F4AC15000FBCBB /* VideoStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */; };330 07C59B5717F4AC15000FBCBB /* VideoStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */; };331 07C59B5D17F4B208000FBCBB /* JSAudioStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */; };332 07C59B5E17F4B208000FBCBB /* JSAudioStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */; };333 07C59B5F17F4B208000FBCBB /* JSVideoStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */; };334 07C59B6017F4B208000FBCBB /* JSVideoStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */; };335 327 07C59B6817F784BA000FBCBB /* MediaSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07C59B6517F784BA000FBCBB /* MediaSourceStates.cpp */; }; 336 328 07C59B6917F784BA000FBCBB /* MediaSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 07C59B6617F784BA000FBCBB /* MediaSourceStates.h */; }; … … 7358 7350 07B5A30A14687B8400A81ECE /* JSTrackEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTrackEventCustom.cpp; sourceTree = "<group>"; }; 7359 7351 07B5A30C14687D7100A81ECE /* JSTextTrackListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextTrackListCustom.cpp; sourceTree = "<group>"; }; 7360 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioStreamTrack.cpp; sourceTree = "<group>"; };7361 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStreamTrack.h; sourceTree = "<group>"; };7362 07C59B4F17F4AC15000FBCBB /* AudioStreamTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioStreamTrack.idl; sourceTree = "<group>"; };7363 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoStreamTrack.cpp; sourceTree = "<group>"; };7364 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoStreamTrack.h; sourceTree = "<group>"; };7365 07C59B5217F4AC15000FBCBB /* VideoStreamTrack.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VideoStreamTrack.idl; sourceTree = "<group>"; };7366 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioStreamTrack.cpp; sourceTree = "<group>"; };7367 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSAudioStreamTrack.h; sourceTree = "<group>"; };7368 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSVideoStreamTrack.cpp; sourceTree = "<group>"; };7369 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVideoStreamTrack.h; sourceTree = "<group>"; };7370 7352 07C59B6517F784BA000FBCBB /* MediaSourceStates.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaSourceStates.cpp; sourceTree = "<group>"; }; 7371 7353 07C59B6617F784BA000FBCBB /* MediaSourceStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaSourceStates.h; sourceTree = "<group>"; }; … … 14548 14530 073AB4B017F8BACA006E0D6F /* AllVideoCapabilities.h */, 14549 14531 07C59B7317F7D09D000FBCBB /* AllVideoCapabilities.idl */, 14550 07C59B4D17F4AC15000FBCBB /* AudioStreamTrack.cpp */,14551 07C59B4E17F4AC15000FBCBB /* AudioStreamTrack.h */,14552 07C59B4F17F4AC15000FBCBB /* AudioStreamTrack.idl */,14553 14532 070584FE17F9F05E005F2BCB /* CapabilityRange.cpp */, 14554 14533 07C59B7417F7D09D000FBCBB /* CapabilityRange.h */, … … 14667 14646 07221B9017CEC32700848E51 /* UserMediaRequest.cpp */, 14668 14647 07221B9117CEC32700848E51 /* UserMediaRequest.h */, 14669 07C59B5017F4AC15000FBCBB /* VideoStreamTrack.cpp */,14670 07C59B5117F4AC15000FBCBB /* VideoStreamTrack.h */,14671 07C59B5217F4AC15000FBCBB /* VideoStreamTrack.idl */,14672 14648 ); 14673 14649 path = mediastream; … … 14770 14746 isa = PBXGroup; 14771 14747 children = ( 14772 07C59B5917F4B208000FBCBB /* JSAudioStreamTrack.cpp */,14773 07C59B5A17F4B208000FBCBB /* JSAudioStreamTrack.h */,14774 14748 07C59B6F17F79C7C000FBCBB /* JSMediaSourceStates.cpp */, 14775 14749 07C59B7017F79C7C000FBCBB /* JSMediaSourceStates.h */, … … 14834 14808 076306DE17E16089005A7C4E /* JSSourceInfo.cpp */, 14835 14809 076306DF17E16089005A7C4E /* JSSourceInfo.h */, 14836 07C59B5B17F4B208000FBCBB /* JSVideoStreamTrack.cpp */,14837 07C59B5C17F4B208000FBCBB /* JSVideoStreamTrack.h */,14838 14810 ); 14839 14811 name = MediaStream; … … 23748 23720 CD8A7BBC197735FE00CBD643 /* AudioSourceProviderAVFObjC.h in Headers */, 23749 23721 FD62F52E145898D80094B0ED /* AudioSourceProviderClient.h in Headers */, 23750 07C59B5417F4AC15000FBCBB /* AudioStreamTrack.h in Headers */,23751 23722 FDB052E01561A42C00B500D6 /* AudioSummingJunction.h in Headers */, 23752 23723 BE88E0D91715D2A200658D98 /* AudioTrack.h in Headers */, … … 25051 25022 FDA15EB412B03EE1003A583A /* JSAudioParam.h in Headers */, 25052 25023 FDA15EB612B03EE1003A583A /* JSAudioProcessingEvent.h in Headers */, 25053 07C59B5E17F4B208000FBCBB /* JSAudioStreamTrack.h in Headers */,25054 25024 BE8EF043171C8FF9009B48C3 /* JSAudioTrack.h in Headers */, 25055 25025 BE8EF045171C8FF9009B48C3 /* JSAudioTrackList.h in Headers */, … … 25564 25534 7C73FB0D191EF5A8007DE061 /* JSUserMessageHandlersNamespace.h in Headers */, 25565 25535 15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */, 25566 07C59B6017F4B208000FBCBB /* JSVideoStreamTrack.h in Headers */,25567 25536 BE8EF04B171C9014009B48C3 /* JSVideoTrack.h in Headers */, 25568 25537 BE8EF04D171C9014009B48C3 /* JSVideoTrackList.h in Headers */, … … 26932 26901 BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */, 26933 26902 CDE83DB2183C44060031EAA3 /* VideoPlaybackQuality.h in Headers */, 26934 07C59B5717F4AC15000FBCBB /* VideoStreamTrack.h in Headers */,26935 26903 46DBB6501AB8C96F00D9A813 /* PowerObserverMac.h in Headers */, 26936 26904 BE88E0DF1715D2A200658D98 /* VideoTrack.h in Headers */, … … 27518 27486 CD54DE4B17469C6D005E5B36 /* AudioSessionMac.cpp in Sources */, 27519 27487 CD8A7BBB197735FE00CBD643 /* AudioSourceProviderAVFObjC.mm in Sources */, 27520 07C59B5317F4AC15000FBCBB /* AudioStreamTrack.cpp in Sources */,27521 27488 FDB052DF1561A42C00B500D6 /* AudioSummingJunction.cpp in Sources */, 27522 27489 BE88E0D81715D2A200658D98 /* AudioTrack.cpp in Sources */, … … 28519 28486 FDA15EB312B03EE1003A583A /* JSAudioParam.cpp in Sources */, 28520 28487 FDA15EB512B03EE1003A583A /* JSAudioProcessingEvent.cpp in Sources */, 28521 07C59B5D17F4B208000FBCBB /* JSAudioStreamTrack.cpp in Sources */,28522 28488 BE8EF042171C8FF9009B48C3 /* JSAudioTrack.cpp in Sources */, 28523 28489 BE6DF711171CA2DA00DD52B8 /* JSAudioTrackCustom.cpp in Sources */, … … 29134 29100 D3F3D3671A69B1A50059FC2B /* JSWebGLRenderingContextBase.cpp in Sources */, 29135 29101 CDE83DB6183D352A0031EAA3 /* JSVideoPlaybackQuality.cpp in Sources */, 29136 07C59B5F17F4B208000FBCBB /* JSVideoStreamTrack.cpp in Sources */,29137 29102 BE8EF04A171C9014009B48C3 /* JSVideoTrack.cpp in Sources */, 29138 29103 BE6DF70B171CA2C500DD52B8 /* JSVideoTrackCustom.cpp in Sources */, … … 30234 30199 FD3160AE12B026F700C1A359 /* VectorMath.cpp in Sources */, 30235 30200 CDE83DB1183C44060031EAA3 /* VideoPlaybackQuality.cpp in Sources */, 30236 07C59B5617F4AC15000FBCBB /* VideoStreamTrack.cpp in Sources */,30237 30201 BE88E0DE1715D2A200658D98 /* VideoTrack.cpp in Sources */, 30238 30202 BE88E0E11715D2A200658D98 /* VideoTrackList.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.