Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp

Issue 2489823002: Revert "Remove MediaStreamTrack.getSources()." (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 14 matching lines...) Expand all
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "platform/mediastream/MediaStreamCenter.h" 32 #include "platform/mediastream/MediaStreamCenter.h"
33 33
34 #include "platform/mediastream/MediaStreamDescriptor.h" 34 #include "platform/mediastream/MediaStreamDescriptor.h"
35 #include "platform/mediastream/MediaStreamTrackSourcesRequest.h"
35 #include "platform/mediastream/MediaStreamWebAudioSource.h" 36 #include "platform/mediastream/MediaStreamWebAudioSource.h"
36 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
37 #include "public/platform/WebAudioSourceProvider.h" 38 #include "public/platform/WebAudioSourceProvider.h"
38 #include "public/platform/WebMediaStream.h" 39 #include "public/platform/WebMediaStream.h"
39 #include "public/platform/WebMediaStreamCenter.h" 40 #include "public/platform/WebMediaStreamCenter.h"
40 #include "public/platform/WebMediaStreamTrack.h" 41 #include "public/platform/WebMediaStreamTrack.h"
41 #include "wtf/Assertions.h" 42 #include "wtf/Assertions.h"
42 #include "wtf/PtrUtil.h" 43 #include "wtf/PtrUtil.h"
43 #include <memory> 44 #include <memory>
44 45
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 128 }
128 129
129 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) { 130 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) {
130 MediaStreamDescriptor* stream = webStream; 131 MediaStreamDescriptor* stream = webStream;
131 MediaStreamDescriptorClient* client = stream->client(); 132 MediaStreamDescriptorClient* client = stream->client();
132 if (client) 133 if (client)
133 client->streamEnded(); 134 client->streamEnded();
134 } 135 }
135 136
136 } // namespace blink 137 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698