OLD | NEW |
---|---|
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 case MediaStreamSource::ReadyStateEnded: | 122 case MediaStreamSource::ReadyStateEnded: |
121 return "ended"; | 123 return "ended"; |
122 } | 124 } |
123 | 125 |
124 ASSERT_NOT_REACHED(); | 126 ASSERT_NOT_REACHED(); |
125 return String(); | 127 return String(); |
126 } | 128 } |
127 | 129 |
128 void MediaStreamTrack::getSources(ExecutionContext* context, PassOwnPtrWillBeRaw Ptr<MediaStreamTrackSourcesCallback> callback, ExceptionState& exceptionState) | 130 void MediaStreamTrack::getSources(ExecutionContext* context, PassOwnPtrWillBeRaw Ptr<MediaStreamTrackSourcesCallback> callback, ExceptionState& exceptionState) |
129 { | 131 { |
132 LocalFrame* frame = toDocument(context)->frame(); | |
133 UserMediaController* userMedia = UserMediaController::from(frame); | |
134 if (!userMedia) { | |
135 exceptionState.throwDOMException(NotSupportedError, "No sources controll er available; is this a detached window?"); | |
jochen (gone - plz use gerrit)
2014/09/11 11:35:44
That's an odd exception. What would a developer do
Henrik Grunell
2014/09/11 11:43:22
Hmm, I borrowed this from NavigatorMediaStream::we
jochen (gone - plz use gerrit)
2014/09/11 11:49:21
ok I guess
Henrik Grunell
2014/09/11 11:58:50
OK. Can you please continue review the CL?
| |
136 return; | |
137 } | |
130 MediaStreamTrackSourcesRequest* request = MediaStreamTrackSourcesRequestImpl ::create(*context, callback); | 138 MediaStreamTrackSourcesRequest* request = MediaStreamTrackSourcesRequestImpl ::create(*context, callback); |
131 if (!MediaStreamCenter::instance().getMediaStreamTrackSources(request)) | 139 userMedia->requestSources(request); |
132 exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::f ailedToExecute("getSources", "MediaStreamTrack", "Functionality not implemented yet")); | |
133 } | 140 } |
134 | 141 |
135 void MediaStreamTrack::stopTrack(ExceptionState& exceptionState) | 142 void MediaStreamTrack::stopTrack(ExceptionState& exceptionState) |
136 { | 143 { |
137 if (ended()) | 144 if (ended()) |
138 return; | 145 return; |
139 | 146 |
140 m_readyState = MediaStreamSource::ReadyStateEnded; | 147 m_readyState = MediaStreamSource::ReadyStateEnded; |
141 MediaStreamCenter::instance().didStopMediaStreamTrack(component()); | 148 MediaStreamCenter::instance().didStopMediaStreamTrack(component()); |
142 dispatchEvent(Event::create(EventTypeNames::ended)); | 149 dispatchEvent(Event::create(EventTypeNames::ended)); |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
227 | 234 |
228 void MediaStreamTrack::trace(Visitor* visitor) | 235 void MediaStreamTrack::trace(Visitor* visitor) |
229 { | 236 { |
230 visitor->trace(m_registeredMediaStreams); | 237 visitor->trace(m_registeredMediaStreams); |
231 visitor->trace(m_component); | 238 visitor->trace(m_component); |
232 EventTargetWithInlineData::trace(visitor); | 239 EventTargetWithInlineData::trace(visitor); |
233 MediaStreamSource::Observer::trace(visitor); | 240 MediaStreamSource::Observer::trace(visitor); |
234 } | 241 } |
235 | 242 |
236 } // namespace blink | 243 } // namespace blink |
OLD | NEW |