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

Side by Side Diff: Source/platform/mediastream/MediaStreamDescriptor.cpp

Issue 400543004: Rename WebCore namespace to blink in Platform (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * 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 17 matching lines...) Expand all
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
34 #include "platform/mediastream/MediaStreamDescriptor.h" 34 #include "platform/mediastream/MediaStreamDescriptor.h"
35 35
36 #include "platform/UUID.h" 36 #include "platform/UUID.h"
37 37
38 namespace WebCore { 38 namespace blink {
39 39
40 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea mSourceVector& audioSources, const MediaStreamSourceVector& videoSources) 40 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea mSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
41 { 41 {
42 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio Sources, videoSources)); 42 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio Sources, videoSources));
43 } 43 }
44 44
45 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea mComponentVector& audioComponents, const MediaStreamComponentVector& videoCompon ents) 45 PassRefPtr<MediaStreamDescriptor> MediaStreamDescriptor::create(const MediaStrea mComponentVector& audioComponents, const MediaStreamComponentVector& videoCompon ents)
46 { 46 {
47 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio Components, videoComponents)); 47 return adoptRef(new MediaStreamDescriptor(createCanonicalUUIDString(), audio Components, videoComponents));
48 } 48 }
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 , m_id(id) 117 , m_id(id)
118 , m_ended(false) 118 , m_ended(false)
119 { 119 {
120 ASSERT(m_id.length()); 120 ASSERT(m_id.length());
121 for (MediaStreamComponentVector::const_iterator iter = audioComponents.begin (); iter != audioComponents.end(); ++iter) 121 for (MediaStreamComponentVector::const_iterator iter = audioComponents.begin (); iter != audioComponents.end(); ++iter)
122 m_audioComponents.append((*iter)); 122 m_audioComponents.append((*iter));
123 for (MediaStreamComponentVector::const_iterator iter = videoComponents.begin (); iter != videoComponents.end(); ++iter) 123 for (MediaStreamComponentVector::const_iterator iter = videoComponents.begin (); iter != videoComponents.end(); ++iter)
124 m_videoComponents.append((*iter)); 124 m_videoComponents.append((*iter));
125 } 125 }
126 126
127 } // namespace WebCore 127 } // namespace blink
128 128
OLDNEW
« no previous file with comments | « Source/platform/mediastream/MediaStreamDescriptor.h ('k') | Source/platform/mediastream/MediaStreamSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698