Merge 157615 "Keep AudioScheduledSourceNode alive until onended ..."

Source/modules/webaudio/AudioScheduledSourceNode.cpp

 /*
  * Copyright (C) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 161 matching lines @@
 
 void AudioScheduledSourceNode::finish()
 {
     if (m_playbackState != FINISHED_STATE) {
         // Let the context dereference this AudioNode.
         context()->notifyNodeFinishedProcessing(this);
         m_playbackState = FINISHED_STATE;
         context()->decrementActiveSourceCount();
     }
 
-    if (m_hasEndedListener)
-        callOnMainThread(&AudioScheduledSourceNode::notifyEndedDispatch, this);
+    if (m_hasEndedListener) {
+        // |task| will keep the AudioScheduledSourceNode alive until the listener has been handled.
+        OwnPtr<NotifyEndedTask> task = adoptPtr(new NotifyEndedTask(this));
+        callOnMainThread(&AudioScheduledSourceNode::notifyEndedDispatch, task.leakPtr());
+    }
 }
 
 void AudioScheduledSourceNode::notifyEndedDispatch(void* userData)
 {
-    static_cast<AudioScheduledSourceNode*>(userData)->notifyEnded();
+    OwnPtr<NotifyEndedTask> task = adoptPtr(static_cast<NotifyEndedTask*>(userData));
+
+    task->notifyEnded();
 }
 
-void AudioScheduledSourceNode::notifyEnded()
+AudioScheduledSourceNode::NotifyEndedTask::NotifyEndedTask(PassRefPtr<AudioScheduledSourceNode> sourceNode)
+    : m_scheduledNode(sourceNode)
+{
+}
+
+void AudioScheduledSourceNode::NotifyEndedTask::notifyEnded()
 {
     RefPtr<Event> event = Event::create(eventNames().endedEvent, FALSE, FALSE);
-    event->setTarget(this);
-    dispatchEvent(event.get());
+    event->setTarget(m_scheduledNode);
+    m_scheduledNode->dispatchEvent(event.get());
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)