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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

Issue 1954693002: Deprecate subscriptions to MediaStream ended event (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/MediaStream.h ('k') | no next file » | 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, 2012 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011, 2012 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 "modules/mediastream/MediaStream.h" 26 #include "modules/mediastream/MediaStream.h"
27 27
28 #include "bindings/core/v8/ExceptionState.h" 28 #include "bindings/core/v8/ExceptionState.h"
29 #include "core/dom/ExceptionCode.h" 29 #include "core/dom/ExceptionCode.h"
30 #include "core/frame/UseCounter.h"
30 #include "modules/mediastream/MediaStreamRegistry.h" 31 #include "modules/mediastream/MediaStreamRegistry.h"
31 #include "modules/mediastream/MediaStreamTrackEvent.h" 32 #include "modules/mediastream/MediaStreamTrackEvent.h"
32 #include "platform/mediastream/MediaStreamCenter.h" 33 #include "platform/mediastream/MediaStreamCenter.h"
33 #include "platform/mediastream/MediaStreamSource.h" 34 #include "platform/mediastream/MediaStreamSource.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc e* source) 38 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc e* source)
38 { 39 {
39 for (size_t i = 0; i < trackVector.size(); ++i) { 40 for (size_t i = 0; i < trackVector.size(); ++i) {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); 295 scheduleDispatchEvent(Event::create(EventTypeNames::inactive));
295 } 296 }
296 297
297 // TODO(guidou): remove firing of this event. See crbug.com/586924 298 // TODO(guidou): remove firing of this event. See crbug.com/586924
298 if (!m_descriptor->ended()) { 299 if (!m_descriptor->ended()) {
299 m_descriptor->setEnded(); 300 m_descriptor->setEnded();
300 scheduleDispatchEvent(Event::create(EventTypeNames::ended)); 301 scheduleDispatchEvent(Event::create(EventTypeNames::ended));
301 } 302 }
302 } 303 }
303 304
305 bool MediaStream::addEventListenerInternal(const AtomicString& eventType, EventL istener* listener, const EventListenerOptions& options)
306 {
307 if (eventType == EventTypeNames::ended)
308 UseCounter::count(getExecutionContext(), UseCounter::MediaStreamOnEnded) ;
309
310 return EventTarget::addEventListenerInternal(eventType, listener, options);
Rick Byers 2016/05/05 14:08:57 nit: This should probably be "EventTargetWithInlin
311 }
312
304 void MediaStream::contextDestroyed() 313 void MediaStream::contextDestroyed()
305 { 314 {
306 ContextLifecycleObserver::contextDestroyed(); 315 ContextLifecycleObserver::contextDestroyed();
307 m_stopped = true; 316 m_stopped = true;
308 } 317 }
309 318
310 const AtomicString& MediaStream::interfaceName() const 319 const AtomicString& MediaStream::interfaceName() const
311 { 320 {
312 return EventTargetNames::MediaStream; 321 return EventTargetNames::MediaStream;
313 } 322 }
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 ContextLifecycleObserver::trace(visitor); 429 ContextLifecycleObserver::trace(visitor);
421 MediaStreamDescriptorClient::trace(visitor); 430 MediaStreamDescriptorClient::trace(visitor);
422 } 431 }
423 432
424 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor) 433 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor)
425 { 434 {
426 return static_cast<MediaStream*>(descriptor->client()); 435 return static_cast<MediaStream*>(descriptor->client());
427 } 436 }
428 437
429 } // namespace blink 438 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/MediaStream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698