| Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| index df8bf1581982710c2826ec201198d017e64714f0..3d32b2606f66e2b5e3d4097ab9838d36ebf4fc23 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp
|
| @@ -130,7 +130,7 @@ private:
|
|
|
| RTCPeerConnection::EventWrapper::EventWrapper(
|
| PassRefPtrWillBeRawPtr<Event> event,
|
| - PassOwnPtrWillBeRawPtr<BoolFunction> function)
|
| + PassOwnPtr<BoolFunction> function)
|
| : m_event(event)
|
| , m_setupFunction(function)
|
| {
|
| @@ -144,6 +144,11 @@ bool RTCPeerConnection::EventWrapper::setup()
|
| return true;
|
| }
|
|
|
| +DEFINE_TRACE(RTCPeerConnection::EventWrapper)
|
| +{
|
| + visitor->trace(m_event);
|
| +}
|
| +
|
| RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& configuration, ExceptionState& exceptionState)
|
| {
|
| if (configuration.isUndefinedOrNull())
|
| @@ -1009,9 +1014,9 @@ void RTCPeerConnection::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> even
|
| }
|
|
|
| void RTCPeerConnection::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event,
|
| - PassOwnPtrWillBeRawPtr<BoolFunction> setupFunction)
|
| + PassOwnPtr<BoolFunction> setupFunction)
|
| {
|
| - m_scheduledEvents.append(EventWrapper(event, setupFunction));
|
| + m_scheduledEvents.append(new EventWrapper(event, setupFunction));
|
|
|
| m_dispatchScheduledEventRunner.runAsync();
|
| }
|
| @@ -1021,13 +1026,13 @@ void RTCPeerConnection::dispatchScheduledEvent()
|
| if (m_stopped)
|
| return;
|
|
|
| - WillBeHeapVector<EventWrapper> events;
|
| + HeapVector<Member<EventWrapper>> events;
|
| events.swap(m_scheduledEvents);
|
|
|
| - WillBeHeapVector<EventWrapper>::iterator it = events.begin();
|
| + HeapVector<Member<EventWrapper>>::iterator it = events.begin();
|
| for (; it != events.end(); ++it) {
|
| - if ((*it).setup()) {
|
| - dispatchEvent((*it).m_event.release());
|
| + if ((*it)->setup()) {
|
| + dispatchEvent((*it)->m_event.release());
|
| }
|
| }
|
|
|
|
|