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

Side by Side Diff: Source/modules/mediastream/MediaStreamTrack.cpp

Issue 559423002: Change MediaStreamTrack::getSources to go through UserMediaClient. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « no previous file | public/web/WebUserMediaClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/mediastream/MediaStreamTrack.h" 27 #include "modules/mediastream/MediaStreamTrack.h"
28 28
29 #include "bindings/core/v8/ExceptionMessages.h" 29 #include "bindings/core/v8/ExceptionMessages.h"
30 #include "core/dom/Document.h"
30 #include "core/dom/ExceptionCode.h" 31 #include "core/dom/ExceptionCode.h"
31 #include "core/dom/ExecutionContext.h" 32 #include "core/dom/ExecutionContext.h"
32 #include "core/events/Event.h" 33 #include "core/events/Event.h"
33 #include "modules/mediastream/MediaStream.h" 34 #include "modules/mediastream/MediaStream.h"
34 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" 35 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
35 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" 36 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h"
37 #include "modules/mediastream/UserMediaController.h"
36 #include "platform/mediastream/MediaStreamCenter.h" 38 #include "platform/mediastream/MediaStreamCenter.h"
37 #include "platform/mediastream/MediaStreamComponent.h" 39 #include "platform/mediastream/MediaStreamComponent.h"
38 #include "public/platform/WebSourceInfo.h" 40 #include "public/platform/WebSourceInfo.h"
39 41
40 namespace blink { 42 namespace blink {
41 43
42 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStrea mComponent* component) 44 MediaStreamTrack* MediaStreamTrack::create(ExecutionContext* context, MediaStrea mComponent* component)
43 { 45 {
44 MediaStreamTrack* track = adoptRefCountedGarbageCollectedWillBeNoop(new Medi aStreamTrack(context, component)); 46 MediaStreamTrack* track = adoptRefCountedGarbageCollectedWillBeNoop(new Medi aStreamTrack(context, component));
45 track->suspendIfNeeded(); 47 track->suspendIfNeeded();
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 case MediaStreamSource::ReadyStateEnded: 123 case MediaStreamSource::ReadyStateEnded:
122 return "ended"; 124 return "ended";
123 } 125 }
124 126
125 ASSERT_NOT_REACHED(); 127 ASSERT_NOT_REACHED();
126 return String(); 128 return String();
127 } 129 }
128 130
129 void MediaStreamTrack::getSources(ExecutionContext* context, PassOwnPtrWillBeRaw Ptr<MediaStreamTrackSourcesCallback> callback, ExceptionState& exceptionState) 131 void MediaStreamTrack::getSources(ExecutionContext* context, PassOwnPtrWillBeRaw Ptr<MediaStreamTrackSourcesCallback> callback, ExceptionState& exceptionState)
130 { 132 {
133 LocalFrame* frame = toDocument(context)->frame();
134 UserMediaController* userMedia = UserMediaController::from(frame);
135 if (!userMedia) {
136 exceptionState.throwDOMException(NotSupportedError, "No sources controll er available; is this a detached window?");
137 return;
138 }
131 MediaStreamTrackSourcesRequest* request = MediaStreamTrackSourcesRequestImpl ::create(*context, callback); 139 MediaStreamTrackSourcesRequest* request = MediaStreamTrackSourcesRequestImpl ::create(*context, callback);
132 if (!MediaStreamCenter::instance().getMediaStreamTrackSources(request)) 140 userMedia->requestSources(request);
133 exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::f ailedToExecute("getSources", "MediaStreamTrack", "Functionality not implemented yet"));
134 } 141 }
135 142
136 void MediaStreamTrack::stopTrack(ExceptionState& exceptionState) 143 void MediaStreamTrack::stopTrack(ExceptionState& exceptionState)
137 { 144 {
138 if (ended()) 145 if (ended())
139 return; 146 return;
140 147
141 m_readyState = MediaStreamSource::ReadyStateEnded; 148 m_readyState = MediaStreamSource::ReadyStateEnded;
142 MediaStreamCenter::instance().didStopMediaStreamTrack(component()); 149 MediaStreamCenter::instance().didStopMediaStreamTrack(component());
143 dispatchEvent(Event::create(EventTypeNames::ended)); 150 dispatchEvent(Event::create(EventTypeNames::ended));
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 return ActiveDOMObject::executionContext(); 233 return ActiveDOMObject::executionContext();
227 } 234 }
228 235
229 void MediaStreamTrack::trace(Visitor* visitor) 236 void MediaStreamTrack::trace(Visitor* visitor)
230 { 237 {
231 visitor->trace(m_registeredMediaStreams); 238 visitor->trace(m_registeredMediaStreams);
232 EventTargetWithInlineData::trace(visitor); 239 EventTargetWithInlineData::trace(visitor);
233 } 240 }
234 241
235 } // namespace blink 242 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | public/web/WebUserMediaClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698