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

Side by Side Diff: Source/core/platform/mediastream/MediaStreamCenter.cpp

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months 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 | Annotate | Revision Log
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 12 matching lines...) Expand all
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 "config.h" 32 #include "config.h"
33
33 #include "core/platform/mediastream/MediaStreamCenter.h" 34 #include "core/platform/mediastream/MediaStreamCenter.h"
34 35
35 #include "core/platform/chromium/support/WebMediaStreamClient.h" 36 #include "core/platform/mediastream/MediaStreamDescriptor.h"
36 #include "public/platform/WebMediaStream.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 MediaStreamCenter::MediaStreamCenter() 40 MediaStreamCenter::MediaStreamCenter()
41 { 41 {
42 } 42 }
43 43
44 MediaStreamCenter::~MediaStreamCenter() 44 MediaStreamCenter::~MediaStreamCenter()
45 { 45 {
46 } 46 }
47 47
48 void MediaStreamCenter::endLocalMediaStream(WebKit::WebMediaStream webStream) 48 void MediaStreamCenter::endLocalMediaStream(MediaStreamDescriptor* streamDescrip tor)
49 { 49 {
50 WebKit::WebMediaStreamClient* client = webStream.client(); 50 MediaStreamDescriptorClient* client = streamDescriptor->client();
51 if (client) 51 if (client)
52 client->streamEnded(); 52 client->streamEnded();
53 else 53 else
54 webStream.setEnded(); 54 streamDescriptor->setEnded();
55 } 55 }
56 56
57 } // namespace WebCore 57 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/mediastream/MediaStreamCenter.h ('k') | Source/core/platform/mediastream/MediaStreamComponent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698