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

Side by Side Diff: Source/platform/exported/WebMediaStream.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) 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 WebCore; 40 using namespace blink;
41 41
42 namespace blink { 42 namespace blink {
43 43
44 namespace { 44 namespace {
45 45
46 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData { 46 class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
47 public: 47 public:
48 ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extr aData(extraData) { } 48 ExtraDataContainer(PassOwnPtr<WebMediaStream::ExtraData> extraData) : m_extr aData(extraData) { }
49 49
50 WebMediaStream::ExtraData* extraData() { return m_extraData.get(); } 50 WebMediaStream::ExtraData* extraData() { return m_extraData.get(); }
51 51
52 private: 52 private:
53 OwnPtr<WebMediaStream::ExtraData> m_extraData; 53 OwnPtr<WebMediaStream::ExtraData> m_extraData;
54 }; 54 };
55 55
56 } // namespace 56 } // namespace
57 57
58 WebMediaStream::WebMediaStream(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor) 58 WebMediaStream::WebMediaStream(const PassRefPtr<blink::MediaStreamDescriptor>& m ediaStreamDescriptor)
59 : m_private(mediaStreamDescriptor) 59 : m_private(mediaStreamDescriptor)
60 { 60 {
61 } 61 }
62 62
63 WebMediaStream::WebMediaStream(WebCore::MediaStreamDescriptor* mediaStreamDescri ptor) 63 WebMediaStream::WebMediaStream(blink::MediaStreamDescriptor* mediaStreamDescript or)
64 : m_private(mediaStreamDescriptor) 64 : m_private(mediaStreamDescriptor)
65 { 65 {
66 } 66 }
67 67
68 void WebMediaStream::reset() 68 void WebMediaStream::reset()
69 { 69 {
70 m_private.reset(); 70 m_private.reset();
71 } 71 }
72 72
73 WebString WebMediaStream::id() const 73 WebString WebMediaStream::id() const
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 ASSERT(!isNull()); 111 ASSERT(!isNull());
112 m_private->addRemoteTrack(track); 112 m_private->addRemoteTrack(track);
113 } 113 }
114 114
115 void WebMediaStream::removeTrack(const WebMediaStreamTrack& track) 115 void WebMediaStream::removeTrack(const WebMediaStreamTrack& track)
116 { 116 {
117 ASSERT(!isNull()); 117 ASSERT(!isNull());
118 m_private->removeRemoteTrack(track); 118 m_private->removeRemoteTrack(track);
119 } 119 }
120 120
121 WebMediaStream& WebMediaStream::operator=(const PassRefPtr<WebCore::MediaStreamD escriptor>& mediaStreamDescriptor) 121 WebMediaStream& WebMediaStream::operator=(const PassRefPtr<blink::MediaStreamDes criptor>& mediaStreamDescriptor)
122 { 122 {
123 m_private = mediaStreamDescriptor; 123 m_private = mediaStreamDescriptor;
124 return *this; 124 return *this;
125 } 125 }
126 126
127 WebMediaStream::operator PassRefPtr<WebCore::MediaStreamDescriptor>() const 127 WebMediaStream::operator PassRefPtr<blink::MediaStreamDescriptor>() const
128 { 128 {
129 return m_private.get(); 129 return m_private.get();
130 } 130 }
131 131
132 WebMediaStream::operator WebCore::MediaStreamDescriptor*() const 132 WebMediaStream::operator blink::MediaStreamDescriptor*() const
133 { 133 {
134 return m_private.get(); 134 return m_private.get();
135 } 135 }
136 136
137 void WebMediaStream::initialize(const WebVector<WebMediaStreamTrack>& audioTrack s, const WebVector<WebMediaStreamTrack>& videoTracks) 137 void WebMediaStream::initialize(const WebVector<WebMediaStreamTrack>& audioTrack s, const WebVector<WebMediaStreamTrack>& videoTracks)
138 { 138 {
139 initialize(createCanonicalUUIDString(), audioTracks, videoTracks); 139 initialize(createCanonicalUUIDString(), audioTracks, videoTracks);
140 } 140 }
141 141
142 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMedia StreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks) 142 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMedia StreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
143 { 143 {
144 MediaStreamComponentVector audio, video; 144 MediaStreamComponentVector audio, video;
145 for (size_t i = 0; i < audioTracks.size(); ++i) { 145 for (size_t i = 0; i < audioTracks.size(); ++i) {
146 MediaStreamComponent* component = audioTracks[i]; 146 MediaStreamComponent* component = audioTracks[i];
147 audio.append(component); 147 audio.append(component);
148 } 148 }
149 for (size_t i = 0; i < videoTracks.size(); ++i) { 149 for (size_t i = 0; i < videoTracks.size(); ++i) {
150 MediaStreamComponent* component = videoTracks[i]; 150 MediaStreamComponent* component = videoTracks[i];
151 video.append(component); 151 video.append(component);
152 } 152 }
153 m_private = MediaStreamDescriptor::create(label, audio, video); 153 m_private = MediaStreamDescriptor::create(label, audio, video);
154 } 154 }
155 155
156 void WebMediaStream::assign(const WebMediaStream& other) 156 void WebMediaStream::assign(const WebMediaStream& other)
157 { 157 {
158 m_private = other.m_private; 158 m_private = other.m_private;
159 } 159 }
160 160
161 } // namespace blink 161 } // 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