Changeset 116317 in webkit
- Timestamp:
- May 7, 2012 10:32:10 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/Platform/ChangeLog
r116127 r116317 1 2012-05-07 Tommy Widenflycht <tommyw@google.com> 2 3 MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor 4 https://bugs.webkit.org/show_bug.cgi?id=85798 5 6 Reviewed by Adam Barth. 7 8 Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor 9 instead of the two MediaStreamSource arrays. 10 11 * chromium/public/WebMediaStreamCenter.h: 12 (WebMediaStreamCenter): 13 (WebKit::WebMediaStreamCenter::constructSDP): 14 1 15 2012-05-04 Tommy Widenflycht <tommyw@google.com> 2 16 -
trunk/Source/WebCore/ChangeLog
r116316 r116317 1 2012-05-07 Tommy Widenflycht <tommyw@google.com> 2 3 MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor 4 https://bugs.webkit.org/show_bug.cgi?id=85798 5 6 Reviewed by Adam Barth. 7 8 Adding another UserMediaRequest::succeed function that takes an MediaStreamDescriptor 9 instead of the two MediaStreamSource arrays. 10 11 Not currently testable. 12 13 * Modules/mediastream/LocalMediaStream.cpp: 14 (WebCore::LocalMediaStream::create): 15 (WebCore): 16 (WebCore::LocalMediaStream::LocalMediaStream): 17 * Modules/mediastream/LocalMediaStream.h: 18 (LocalMediaStream): 19 * Modules/mediastream/UserMediaRequest.cpp: 20 (WebCore::UserMediaRequest::succeed): 21 (WebCore): 22 * Modules/mediastream/UserMediaRequest.h: 23 (WebCore): 24 (UserMediaRequest): 25 1 26 2012-05-07 Michal Mocny <mmocny@google.com> 2 27 -
trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.cpp
r116311 r116317 36 36 PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) 37 37 { 38 return adoptRef(new LocalMediaStream(context, audioSources, videoSources));38 return adoptRef(new LocalMediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources))); 39 39 } 40 40 41 LocalMediaStream::LocalMediaStream(ScriptExecutionContext* context, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources) 42 : MediaStream(context, MediaStreamDescriptor::create(createCanonicalUUIDString(), audioSources, videoSources)) 41 PassRefPtr<LocalMediaStream> LocalMediaStream::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor) 42 { 43 return adoptRef(new LocalMediaStream(context, streamDescriptor)); 44 } 45 46 LocalMediaStream::LocalMediaStream(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor) 47 : MediaStream(context, streamDescriptor) 43 48 { 44 49 } -
trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.h
r116311 r116317 36 36 public: 37 37 static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); 38 static PassRefPtr<LocalMediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>); 38 39 virtual ~LocalMediaStream(); 39 40 … … 44 45 45 46 private: 46 LocalMediaStream(ScriptExecutionContext*, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);47 LocalMediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>); 47 48 }; 48 49 -
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
r115810 r116317 39 39 #include "LocalMediaStream.h" 40 40 #include "MediaStreamCenter.h" 41 #include "MediaStreamDescriptor.h" 41 42 #include "SpaceSplitString.h" 42 43 #include "UserMediaController.h" … … 89 90 } 90 91 92 void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescriptor) 93 { 94 if (!m_scriptExecutionContext) 95 return; 96 97 RefPtr<LocalMediaStream> stream = LocalMediaStream::create(m_scriptExecutionContext, streamDescriptor); 98 m_successCallback->handleEvent(stream.get()); 99 } 100 91 101 void UserMediaRequest::fail() 92 102 { -
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h
r115810 r116317 46 46 47 47 class Dictionary; 48 class MediaStreamDescriptor; 48 49 class UserMediaController; 49 50 … … 59 60 60 61 void succeed(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources); 62 void succeed(PassRefPtr<MediaStreamDescriptor>); 61 63 void fail(); 62 64 -
trunk/Source/WebKit/chromium/ChangeLog
r116290 r116317 1 2012-05-07 Tommy Widenflycht <tommyw@google.com> 2 3 MediaStream API: Allow UserMediaRequest::succeed to take an MediaStreamDescriptor 4 https://bugs.webkit.org/show_bug.cgi?id=85798 5 6 Reviewed by Adam Barth. 7 8 Adding another WebUserMediaRequest::requestSucceed function that takes an 9 WebMediaStreamDescriptor instead of the two WebMediaStreamSource arrays. 10 11 * public/WebUserMediaRequest.h: 12 (WebKit): 13 (WebUserMediaRequest): 14 * src/WebUserMediaRequest.cpp: 15 (WebKit::WebUserMediaRequest::requestSucceeded): 16 1 17 2012-05-07 Kinuko Yasuda <kinuko@chromium.org> 2 18 -
trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h
r115810 r116317 42 42 namespace WebKit { 43 43 44 class WebMediaStreamDescriptor; 44 45 class WebMediaStreamSource; 45 46 class WebString; … … 68 69 WEBKIT_EXPORT WebSecurityOrigin securityOrigin() const; 69 70 71 // DEPRECATED 70 72 WEBKIT_EXPORT void requestSucceeded(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources); 73 74 WEBKIT_EXPORT void requestSucceeded(const WebMediaStreamDescriptor&); 75 71 76 WEBKIT_EXPORT void requestFailed(); 72 77 -
trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
r115810 r116317 37 37 #include "Document.h" 38 38 #include "Frame.h" 39 #include "MediaStreamDescriptor.h" 39 40 #include "MediaStreamSource.h" 40 41 #include "Page.h" … … 42 43 #include "UserMediaRequest.h" 43 44 #include "WebSecurityOrigin.h" 45 #include "platform/WebMediaStreamDescriptor.h" 44 46 #include "platform/WebMediaStreamSource.h" 45 47 #include "platform/WebString.h" … … 96 98 } 97 99 100 void WebUserMediaRequest::requestSucceeded(const WebMediaStreamDescriptor& streamDescriptor) 101 { 102 ASSERT(!streamDescriptor.isNull()); 103 if (m_private.isNull()) 104 return; 105 106 m_private->succeed(streamDescriptor); 107 } 108 98 109 void WebUserMediaRequest::requestFailed() 99 110 {
Note: See TracChangeset
for help on using the changeset viewer.