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

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

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 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/v8/ExceptionState.h"
30 #include "core/dom/Event.h" 29 #include "core/dom/Event.h"
31 #include "core/dom/ExceptionCode.h"
32 #include "core/dom/ScriptExecutionContext.h" 30 #include "core/dom/ScriptExecutionContext.h"
33 #include "core/platform/mediastream/MediaStreamCenter.h" 31 #include "core/platform/mediastream/MediaStreamCenter.h"
34 #include "core/platform/mediastream/MediaStreamComponent.h" 32 #include "core/platform/mediastream/MediaStreamComponent.h"
35 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" 33 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
36 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h" 34 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h"
37 #include "public/platform/WebSourceInfo.h" 35 #include "public/platform/WebSourceInfo.h"
38 36
39 namespace WebCore { 37 namespace WebCore {
40 38
41 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* co ntext, MediaStreamComponent* component) 39 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* co ntext, MediaStreamComponent* component)
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 case MediaStreamSource::ReadyStateMuted: 112 case MediaStreamSource::ReadyStateMuted:
115 return ASCIILiteral("muted"); 113 return ASCIILiteral("muted");
116 case MediaStreamSource::ReadyStateEnded: 114 case MediaStreamSource::ReadyStateEnded:
117 return ASCIILiteral("ended"); 115 return ASCIILiteral("ended");
118 } 116 }
119 117
120 ASSERT_NOT_REACHED(); 118 ASSERT_NOT_REACHED();
121 return String(); 119 return String();
122 } 120 }
123 121
124 void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<Me diaStreamTrackSourcesCallback> callback, ExceptionState& es) 122 void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<Me diaStreamTrackSourcesCallback> callback, ExceptionCode& ec)
125 { 123 {
126 RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequ est::create(context, callback); 124 RefPtr<MediaStreamTrackSourcesRequest> request = MediaStreamTrackSourcesRequ est::create(context, callback);
127 bool ok = MediaStreamCenter::instance().getMediaStreamTrackSources(request.r elease()); 125 bool ok = MediaStreamCenter::instance().getMediaStreamTrackSources(request.r elease());
128 if (!ok) 126 if (!ok)
129 es.throwDOMException(NotSupportedError); 127 ec = NotSupportedError;
130 } 128 }
131 129
132 bool MediaStreamTrack::ended() const 130 bool MediaStreamTrack::ended() const
133 { 131 {
134 return m_stopped || (m_component->source()->readyState() == MediaStreamSourc e::ReadyStateEnded); 132 return m_stopped || (m_component->source()->readyState() == MediaStreamSourc e::ReadyStateEnded);
135 } 133 }
136 134
137 void MediaStreamTrack::sourceChangedState() 135 void MediaStreamTrack::sourceChangedState()
138 { 136 {
139 if (m_stopped) 137 if (m_stopped)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 { 184 {
187 return &m_eventTargetData; 185 return &m_eventTargetData;
188 } 186 }
189 187
190 EventTargetData* MediaStreamTrack::ensureEventTargetData() 188 EventTargetData* MediaStreamTrack::ensureEventTargetData()
191 { 189 {
192 return &m_eventTargetData; 190 return &m_eventTargetData;
193 } 191 }
194 192
195 } // namespace WebCore 193 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaStreamTrack.h ('k') | Source/modules/mediastream/NavigatorMediaStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698