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

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

Issue 1862163002: WebKit MediaStream cleanup: ASSERT-->DCHECK and ASSERT_NOT_REACHED-->NOTREACHED etc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted CHECK --> RELEASE_ASSERT and added TODO Created 4 years, 8 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
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
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 MediaStream* MediaStream::create(ExecutionContext* context) 56 MediaStream* MediaStream::create(ExecutionContext* context)
57 { 57 {
58 MediaStreamTrackVector audioTracks; 58 MediaStreamTrackVector audioTracks;
59 MediaStreamTrackVector videoTracks; 59 MediaStreamTrackVector videoTracks;
60 60
61 return new MediaStream(context, audioTracks, videoTracks); 61 return new MediaStream(context, audioTracks, videoTracks);
62 } 62 }
63 63
64 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream) 64 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream)
65 { 65 {
66 ASSERT(stream); 66 DCHECK(stream);
67 67
68 MediaStreamTrackVector audioTracks; 68 MediaStreamTrackVector audioTracks;
69 MediaStreamTrackVector videoTracks; 69 MediaStreamTrackVector videoTracks;
70 70
71 for (size_t i = 0; i < stream->m_audioTracks.size(); ++i) 71 for (size_t i = 0; i < stream->m_audioTracks.size(); ++i)
72 processTrack(stream->m_audioTracks[i].get(), audioTracks); 72 processTrack(stream->m_audioTracks[i].get(), audioTracks);
73 73
74 for (size_t i = 0; i < stream->m_videoTracks.size(); ++i) 74 for (size_t i = 0; i < stream->m_videoTracks.size(); ++i)
75 processTrack(stream->m_videoTracks[i].get(), videoTracks); 75 processTrack(stream->m_videoTracks[i].get(), videoTracks);
76 76
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 return EventTargetNames::MediaStream; 312 return EventTargetNames::MediaStream;
313 } 313 }
314 314
315 ExecutionContext* MediaStream::getExecutionContext() const 315 ExecutionContext* MediaStream::getExecutionContext() const
316 { 316 {
317 return ContextLifecycleObserver::getExecutionContext(); 317 return ContextLifecycleObserver::getExecutionContext();
318 } 318 }
319 319
320 void MediaStream::addRemoteTrack(MediaStreamComponent* component) 320 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
321 { 321 {
322 ASSERT(component); 322 DCHECK(component);
323 if (m_stopped) 323 if (m_stopped)
324 return; 324 return;
325 325
326 MediaStreamTrack* track = MediaStreamTrack::create(getExecutionContext(), co mponent); 326 MediaStreamTrack* track = MediaStreamTrack::create(getExecutionContext(), co mponent);
327 switch (component->source()->type()) { 327 switch (component->source()->type()) {
328 case MediaStreamSource::TypeAudio: 328 case MediaStreamSource::TypeAudio:
329 m_audioTracks.append(track); 329 m_audioTracks.append(track);
330 break; 330 break;
331 case MediaStreamSource::TypeVideo: 331 case MediaStreamSource::TypeVideo:
332 m_videoTracks.append(track); 332 m_videoTracks.append(track);
333 break; 333 break;
334 } 334 }
335 track->registerMediaStream(this); 335 track->registerMediaStream(this);
336 m_descriptor->addComponent(component); 336 m_descriptor->addComponent(component);
337 337
338 scheduleDispatchEvent(MediaStreamTrackEvent::create(EventTypeNames::addtrack , false, false, track)); 338 scheduleDispatchEvent(MediaStreamTrackEvent::create(EventTypeNames::addtrack , false, false, track));
339 339
340 if (!active() && !track->ended()) { 340 if (!active() && !track->ended()) {
341 m_descriptor->setActive(true); 341 m_descriptor->setActive(true);
342 scheduleDispatchEvent(Event::create(EventTypeNames::active)); 342 scheduleDispatchEvent(Event::create(EventTypeNames::active));
343 } 343 }
344 } 344 }
345 345
346 void MediaStream::removeRemoteTrack(MediaStreamComponent* component) 346 void MediaStream::removeRemoteTrack(MediaStreamComponent* component)
347 { 347 {
348 ASSERT(component); 348 DCHECK(component);
349 if (m_stopped) 349 if (m_stopped)
350 return; 350 return;
351 351
352 MediaStreamTrackVector* tracks = 0; 352 MediaStreamTrackVector* tracks = 0;
353 switch (component->source()->type()) { 353 switch (component->source()->type()) {
354 case MediaStreamSource::TypeAudio: 354 case MediaStreamSource::TypeAudio:
355 tracks = &m_audioTracks; 355 tracks = &m_audioTracks;
356 break; 356 break;
357 case MediaStreamSource::TypeVideo: 357 case MediaStreamSource::TypeVideo:
358 tracks = &m_videoTracks; 358 tracks = &m_videoTracks;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 visitor->trace(m_audioTracks); 415 visitor->trace(m_audioTracks);
416 visitor->trace(m_videoTracks); 416 visitor->trace(m_videoTracks);
417 visitor->trace(m_descriptor); 417 visitor->trace(m_descriptor);
418 visitor->trace(m_scheduledEvents); 418 visitor->trace(m_scheduledEvents);
419 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi tor); 419 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi tor);
420 ContextLifecycleObserver::trace(visitor); 420 ContextLifecycleObserver::trace(visitor);
421 MediaStreamDescriptorClient::trace(visitor); 421 MediaStreamDescriptorClient::trace(visitor);
422 } 422 }
423 423
424 } // namespace blink 424 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698