| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 m_descriptor->setActive(false); | 377 m_descriptor->setActive(false); |
| 378 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); | 378 scheduleDispatchEvent(Event::create(EventTypeNames::inactive)); |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 void MediaStream::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event) | 382 void MediaStream::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event) |
| 383 { | 383 { |
| 384 m_scheduledEvents.append(event); | 384 m_scheduledEvents.append(event); |
| 385 | 385 |
| 386 if (!m_scheduledEventTimer.isActive()) | 386 if (!m_scheduledEventTimer.isActive()) |
| 387 m_scheduledEventTimer.startOneShot(0, FROM_HERE); | 387 m_scheduledEventTimer.startOneShot(0, BLINK_FROM_HERE); |
| 388 } | 388 } |
| 389 | 389 |
| 390 void MediaStream::scheduledEventTimerFired(Timer<MediaStream>*) | 390 void MediaStream::scheduledEventTimerFired(Timer<MediaStream>*) |
| 391 { | 391 { |
| 392 if (m_stopped) | 392 if (m_stopped) |
| 393 return; | 393 return; |
| 394 | 394 |
| 395 WillBeHeapVector<RefPtrWillBeMember<Event>> events; | 395 WillBeHeapVector<RefPtrWillBeMember<Event>> events; |
| 396 events.swap(m_scheduledEvents); | 396 events.swap(m_scheduledEvents); |
| 397 | 397 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 412 visitor->trace(m_audioTracks); | 412 visitor->trace(m_audioTracks); |
| 413 visitor->trace(m_videoTracks); | 413 visitor->trace(m_videoTracks); |
| 414 visitor->trace(m_descriptor); | 414 visitor->trace(m_descriptor); |
| 415 visitor->trace(m_scheduledEvents); | 415 visitor->trace(m_scheduledEvents); |
| 416 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi
tor); | 416 RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visi
tor); |
| 417 ContextLifecycleObserver::trace(visitor); | 417 ContextLifecycleObserver::trace(visitor); |
| 418 MediaStreamDescriptorClient::trace(visitor); | 418 MediaStreamDescriptorClient::trace(visitor); |
| 419 } | 419 } |
| 420 | 420 |
| 421 } // namespace blink | 421 } // namespace blink |
| OLD | NEW |