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

Side by Side Diff: Source/platform/exported/WebMediaStream.cpp

Issue 458313005: Cleanup namespace usage from animation to exported in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Cleanup namespace usage from animation to exported in platform/ Created 6 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 #include "platform/mediastream/MediaStreamComponent.h" 30 #include "platform/mediastream/MediaStreamComponent.h"
31 #include "platform/mediastream/MediaStreamDescriptor.h" 31 #include "platform/mediastream/MediaStreamDescriptor.h"
32 #include "platform/mediastream/MediaStreamSource.h" 32 #include "platform/mediastream/MediaStreamSource.h"
33 #include "public/platform/WebMediaStreamSource.h" 33 #include "public/platform/WebMediaStreamSource.h"
34 #include "public/platform/WebMediaStreamTrack.h" 34 #include "public/platform/WebMediaStreamTrack.h"
35 #include "public/platform/WebString.h" 35 #include "public/platform/WebString.h"
36 #include "wtf/OwnPtr.h" 36 #include "wtf/OwnPtr.h"
37 #include "wtf/PassOwnPtr.h" 37 #include "wtf/PassOwnPtr.h"
38 #include "wtf/Vector.h" 38 #include "wtf/Vector.h"
39 39
40 using namespace blink;
41
42 namespace blink { 40 namespace blink {
43 41
44 namespace { 42 namespace {
45 43
46 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData { 44 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
47 public: 45 public:
48 ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extr aData(extraData) { } 46 ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extr aData(extraData) { }
49 47
50 WebMediaStream::ExtraData* extraData() { return m_extraData.get(); } 48 WebMediaStream::ExtraData* extraData() { return m_extraData.get(); }
51 49
52 private: 50 private:
53 OwnPtr<WebMediaStream::ExtraData> m_extraData; 51 OwnPtr<WebMediaStream::ExtraData> m_extraData;
54 }; 52 };
55 53
56 } // namespace 54 } // namespace
57 55
58 WebMediaStream::WebMediaStream(const PassRefPtr<blink::MediaStreamDescriptor>& m ediaStreamDescriptor) 56 WebMediaStream::WebMediaStream(const PassRefPtr<MediaStreamDescriptor>& mediaStr eamDescriptor)
59 : m_private(mediaStreamDescriptor) 57 : m_private(mediaStreamDescriptor)
60 { 58 {
61 } 59 }
62 60
63 WebMediaStream::WebMediaStream(blink::MediaStreamDescriptor* mediaStreamDescript or) 61 WebMediaStream::WebMediaStream(MediaStreamDescriptor* mediaStreamDescriptor)
64 : m_private(mediaStreamDescriptor) 62 : m_private(mediaStreamDescriptor)
65 { 63 {
66 } 64 }
67 65
68 void WebMediaStream::reset() 66 void WebMediaStream::reset()
69 { 67 {
70 m_private.reset(); 68 m_private.reset();
71 } 69 }
72 70
73 WebString WebMediaStream::id() const 71 WebString WebMediaStream::id() const
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 ASSERT(!isNull()); 109 ASSERT(!isNull());
112 m_private->addRemoteTrack(track); 110 m_private->addRemoteTrack(track);
113 } 111 }
114 112
115 void WebMediaStream::removeTrack(const WebMediaStreamTrack& track) 113 void WebMediaStream::removeTrack(const WebMediaStreamTrack& track)
116 { 114 {
117 ASSERT(!isNull()); 115 ASSERT(!isNull());
118 m_private->removeRemoteTrack(track); 116 m_private->removeRemoteTrack(track);
119 } 117 }
120 118
121 WebMediaStream& WebMediaStream::operator=(const PassRefPtr<blink::MediaStreamDes criptor>& mediaStreamDescriptor) 119 WebMediaStream& WebMediaStream::operator=(const PassRefPtr<MediaStreamDescriptor >& mediaStreamDescriptor)
122 { 120 {
123 m_private = mediaStreamDescriptor; 121 m_private = mediaStreamDescriptor;
124 return *this; 122 return *this;
125 } 123 }
126 124
127 WebMediaStream::operator PassRefPtr<blink::MediaStreamDescriptor>() const 125 WebMediaStream::operator PassRefPtr<MediaStreamDescriptor>() const
128 { 126 {
129 return m_private.get(); 127 return m_private.get();
130 } 128 }
131 129
132 WebMediaStream::operator blink::MediaStreamDescriptor*() const 130 WebMediaStream::operator MediaStreamDescriptor*() const
133 { 131 {
134 return m_private.get(); 132 return m_private.get();
135 } 133 }
136 134
137 void WebMediaStream::initialize(const WebVector<WebMediaStreamTrack>& audioTrack s, const WebVector<WebMediaStreamTrack>& videoTracks) 135 void WebMediaStream::initialize(const WebVector<WebMediaStreamTrack>& audioTrack s, const WebVector<WebMediaStreamTrack>& videoTracks)
138 { 136 {
139 initialize(createCanonicalUUIDString(), audioTracks, videoTracks); 137 initialize(createCanonicalUUIDString(), audioTracks, videoTracks);
140 } 138 }
141 139
142 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMedia StreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks) 140 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMedia StreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
143 { 141 {
144 MediaStreamComponentVector audio, video; 142 MediaStreamComponentVector audio, video;
145 for (size_t i = 0; i < audioTracks.size(); ++i) { 143 for (size_t i = 0; i < audioTracks.size(); ++i) {
146 MediaStreamComponent* component = audioTracks[i]; 144 MediaStreamComponent* component = audioTracks[i];
147 audio.append(component); 145 audio.append(component);
148 } 146 }
149 for (size_t i = 0; i < videoTracks.size(); ++i) { 147 for (size_t i = 0; i < videoTracks.size(); ++i) {
150 MediaStreamComponent* component = videoTracks[i]; 148 MediaStreamComponent* component = videoTracks[i];
151 video.append(component); 149 video.append(component);
152 } 150 }
153 m_private = MediaStreamDescriptor::create(label, audio, video); 151 m_private = MediaStreamDescriptor::create(label, audio, video);
154 } 152 }
155 153
156 void WebMediaStream::assign(const WebMediaStream& other) 154 void WebMediaStream::assign(const WebMediaStream& other)
157 { 155 {
158 m_private = other.m_private; 156 m_private = other.m_private;
159 } 157 }
160 158
161 } // namespace blink 159 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/exported/WebImageSkia.cpp ('k') | Source/platform/exported/WebMediaStreamSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698