| 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, 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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 track->unregisterMediaStream(this); | 371 track->unregisterMediaStream(this); |
| 372 tracks->remove(index); | 372 tracks->remove(index); |
| 373 scheduleDispatchEvent(MediaStreamTrackEvent::create(EventTypeNames::removetr
ack, false, false, track)); | 373 scheduleDispatchEvent(MediaStreamTrackEvent::create(EventTypeNames::removetr
ack, false, false, track)); |
| 374 | 374 |
| 375 if (active() && emptyOrOnlyEndedTracks()) { | 375 if (active() && emptyOrOnlyEndedTracks()) { |
| 376 m_descriptor->setActive(false); | 376 m_descriptor->setActive(false); |
| 377 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); | 377 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); |
| 378 } | 378 } |
| 379 } | 379 } |
| 380 | 380 |
| 381 void MediaStream::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event) | 381 void MediaStream::scheduleDispatchEvent(RawPtr<Event> event) |
| 382 { | 382 { |
| 383 m_scheduledEvents.append(event); | 383 m_scheduledEvents.append(event); |
| 384 | 384 |
| 385 if (!m_scheduledEventTimer.isActive()) | 385 if (!m_scheduledEventTimer.isActive()) |
| 386 m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE); | 386 m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE); |
| 387 } | 387 } |
| 388 | 388 |
| 389 void MediaStream::scheduledEventTimerFired(Timer<MediaStream>*) | 389 void MediaStream::scheduledEventTimerFired(Timer<MediaStream>*) |
| 390 { | 390 { |
| 391 if (m_stopped) | 391 if (m_stopped) |
| 392 return; | 392 return; |
| 393 | 393 |
| 394 WillBeHeapVector<RefPtrWillBeMember<Event>> events; | 394 HeapVector<Member<Event>> events; |
| 395 events.swap(m_scheduledEvents); | 395 events.swap(m_scheduledEvents); |
| 396 | 396 |
| 397 WillBeHeapVector<RefPtrWillBeMember<Event>>::iterator it = events.begin(); | 397 HeapVector<Member<Event>>::iterator it = events.begin(); |
| 398 for (; it != events.end(); ++it) | 398 for (; it != events.end(); ++it) |
| 399 dispatchEvent((*it).release()); | 399 dispatchEvent((*it).release()); |
| 400 | 400 |
| 401 events.clear(); | 401 events.clear(); |
| 402 } | 402 } |
| 403 | 403 |
| 404 URLRegistry& MediaStream::registry() const | 404 URLRegistry& MediaStream::registry() const |
| 405 { | 405 { |
| 406 return MediaStreamRegistry::registry(); | 406 return MediaStreamRegistry::registry(); |
| 407 } | 407 } |
| 408 | 408 |
| 409 DEFINE_TRACE(MediaStream) | 409 DEFINE_TRACE(MediaStream) |
| 410 { | 410 { |
| 411 visitor->trace(m_audioTracks); | 411 visitor->trace(m_audioTracks); |
| 412 visitor->trace(m_videoTracks); | 412 visitor->trace(m_videoTracks); |
| 413 visitor->trace(m_descriptor); | 413 visitor->trace(m_descriptor); |
| 414 visitor->trace(m_scheduledEvents); | 414 visitor->trace(m_scheduledEvents); |
| 415 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi
tor); | 415 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi
tor); |
| 416 ContextLifecycleObserver::trace(visitor); | 416 ContextLifecycleObserver::trace(visitor); |
| 417 MediaStreamDescriptorClient::trace(visitor); | 417 MediaStreamDescriptorClient::trace(visitor); |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace blink | 420 } // namespace blink |
| OLD | NEW |