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

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

Issue 2610233002: Check ExecutionContext before calling isContextDestroyed() (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | 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
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin(); 288 for (MediaStreamTrackVector::iterator iter = m_videoTracks.begin();
289 iter != m_videoTracks.end(); ++iter) { 289 iter != m_videoTracks.end(); ++iter) {
290 if (!(*iter)->ended()) 290 if (!(*iter)->ended())
291 return; 291 return;
292 } 292 }
293 293
294 streamEnded(); 294 streamEnded();
295 } 295 }
296 296
297 void MediaStream::streamEnded() { 297 void MediaStream::streamEnded() {
298 if (m_executionContext->isContextDestroyed()) 298 if (!m_executionContext || m_executionContext->isContextDestroyed())
299 return; 299 return;
300 300
301 if (active()) { 301 if (active()) {
302 m_descriptor->setActive(false); 302 m_descriptor->setActive(false);
303 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); 303 scheduleDispatchEvent(Event::create(EventTypeNames::inactive));
304 } 304 }
305 } 305 }
306 306
307 bool MediaStream::addEventListenerInternal( 307 bool MediaStream::addEventListenerInternal(
308 const AtomicString& eventType, 308 const AtomicString& eventType,
309 EventListener* listener, 309 EventListener* listener,
310 const AddEventListenerOptionsResolved& options) { 310 const AddEventListenerOptionsResolved& options) {
311 if (eventType == EventTypeNames::active) 311 if (eventType == EventTypeNames::active)
312 UseCounter::count(m_executionContext, UseCounter::MediaStreamOnActive); 312 UseCounter::count(m_executionContext, UseCounter::MediaStreamOnActive);
313 else if (eventType == EventTypeNames::inactive) 313 else if (eventType == EventTypeNames::inactive)
314 UseCounter::count(m_executionContext, UseCounter::MediaStreamOnInactive); 314 UseCounter::count(m_executionContext, UseCounter::MediaStreamOnInactive);
315 315
316 return EventTargetWithInlineData::addEventListenerInternal(eventType, 316 return EventTargetWithInlineData::addEventListenerInternal(eventType,
317 listener, options); 317 listener, options);
318 } 318 }
319 319
320 const AtomicString& MediaStream::interfaceName() const { 320 const AtomicString& MediaStream::interfaceName() const {
321 return EventTargetNames::MediaStream; 321 return EventTargetNames::MediaStream;
322 } 322 }
323 323
324 void MediaStream::addRemoteTrack(MediaStreamComponent* component) { 324 void MediaStream::addRemoteTrack(MediaStreamComponent* component) {
325 DCHECK(component); 325 DCHECK(component);
326 if (m_executionContext->isContextDestroyed()) 326 if (!m_executionContext || m_executionContext->isContextDestroyed())
327 return; 327 return;
328 328
329 MediaStreamTrack* track = 329 MediaStreamTrack* track =
330 MediaStreamTrack::create(m_executionContext, component); 330 MediaStreamTrack::create(m_executionContext, component);
331 switch (component->source()->type()) { 331 switch (component->source()->type()) {
332 case MediaStreamSource::TypeAudio: 332 case MediaStreamSource::TypeAudio:
333 m_audioTracks.append(track); 333 m_audioTracks.append(track);
334 break; 334 break;
335 case MediaStreamSource::TypeVideo: 335 case MediaStreamSource::TypeVideo:
336 m_videoTracks.append(track); 336 m_videoTracks.append(track);
337 break; 337 break;
338 } 338 }
339 track->registerMediaStream(this); 339 track->registerMediaStream(this);
340 m_descriptor->addComponent(component); 340 m_descriptor->addComponent(component);
341 341
342 scheduleDispatchEvent( 342 scheduleDispatchEvent(
343 MediaStreamTrackEvent::create(EventTypeNames::addtrack, track)); 343 MediaStreamTrackEvent::create(EventTypeNames::addtrack, track));
344 344
345 if (!active() && !track->ended()) { 345 if (!active() && !track->ended()) {
346 m_descriptor->setActive(true); 346 m_descriptor->setActive(true);
347 scheduleDispatchEvent(Event::create(EventTypeNames::active)); 347 scheduleDispatchEvent(Event::create(EventTypeNames::active));
348 } 348 }
349 } 349 }
350 350
351 void MediaStream::removeRemoteTrack(MediaStreamComponent* component) { 351 void MediaStream::removeRemoteTrack(MediaStreamComponent* component) {
352 DCHECK(component); 352 DCHECK(component);
353 if (m_executionContext->isContextDestroyed()) 353 if (!m_executionContext || m_executionContext->isContextDestroyed())
354 return; 354 return;
355 355
356 MediaStreamTrackVector* tracks = 0; 356 MediaStreamTrackVector* tracks = 0;
357 switch (component->source()->type()) { 357 switch (component->source()->type()) {
358 case MediaStreamSource::TypeAudio: 358 case MediaStreamSource::TypeAudio:
359 tracks = &m_audioTracks; 359 tracks = &m_audioTracks;
360 break; 360 break;
361 case MediaStreamSource::TypeVideo: 361 case MediaStreamSource::TypeVideo:
362 tracks = &m_videoTracks; 362 tracks = &m_videoTracks;
363 break; 363 break;
(...skipping 24 matching lines...) Expand all
388 } 388 }
389 389
390 void MediaStream::scheduleDispatchEvent(Event* event) { 390 void MediaStream::scheduleDispatchEvent(Event* event) {
391 m_scheduledEvents.append(event); 391 m_scheduledEvents.append(event);
392 392
393 if (!m_scheduledEventTimer.isActive()) 393 if (!m_scheduledEventTimer.isActive())
394 m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE); 394 m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE);
395 } 395 }
396 396
397 void MediaStream::scheduledEventTimerFired(TimerBase*) { 397 void MediaStream::scheduledEventTimerFired(TimerBase*) {
398 if (m_executionContext->isContextDestroyed()) 398 if (!m_executionContext || m_executionContext->isContextDestroyed())
399 return; 399 return;
400 400
401 HeapVector<Member<Event>> events; 401 HeapVector<Member<Event>> events;
402 events.swap(m_scheduledEvents); 402 events.swap(m_scheduledEvents);
403 403
404 HeapVector<Member<Event>>::iterator it = events.begin(); 404 HeapVector<Member<Event>>::iterator it = events.begin();
405 for (; it != events.end(); ++it) 405 for (; it != events.end(); ++it)
406 dispatchEvent((*it).release()); 406 dispatchEvent((*it).release());
407 407
408 events.clear(); 408 events.clear();
(...skipping 11 matching lines...) Expand all
420 visitor->trace(m_executionContext); 420 visitor->trace(m_executionContext);
421 EventTargetWithInlineData::trace(visitor); 421 EventTargetWithInlineData::trace(visitor);
422 MediaStreamDescriptorClient::trace(visitor); 422 MediaStreamDescriptorClient::trace(visitor);
423 } 423 }
424 424
425 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor) { 425 MediaStream* toMediaStream(MediaStreamDescriptor* descriptor) {
426 return static_cast<MediaStream*>(descriptor->client()); 426 return static_cast<MediaStream*>(descriptor->client());
427 } 427 }
428 428
429 } // namespace blink 429 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698