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

Source/modules/webaudio/AudioScheduledSourceNode.h

 /*
  * 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
@@ skipping 36 matching lines @@
     // The state can only transition to the next state, except for the FINISHED_STATE which can
     // never be changed.
     enum PlaybackState {
         // These must be defined with the same names and values as in the .idl file.
         UNSCHEDULED_STATE = 0,
         SCHEDULED_STATE = 1,
         PLAYING_STATE = 2,
         FINISHED_STATE = 3
     };
 
+    // This helper class handles the lifetime of an AudioScheduledSourceNode with an onended event
+    // listener. This keeps the node alive until the event listener is processed.
+    class NotifyEndedTask {
+    public:
+        NotifyEndedTask(PassRefPtr<AudioScheduledSourceNode> scheduledNode);
+        void notifyEnded();
+
+    private:
+        RefPtr<AudioScheduledSourceNode> m_scheduledNode;
+    };
+
     AudioScheduledSourceNode(AudioContext*, float sampleRate);
 
     // Scheduling.
     void start(double when);
     void stop(double when);
 
     void noteOn(double when);
     void noteOff(double when);
 
     unsigned short playbackState() const { return static_cast<unsigned short>(m_playbackState); }
@@ skipping 13 matching lines @@
     // nonSilentFramesToProcess : Number of frames rendering non-silence (will be <= quantumFrameSize).
     void updateSchedulingInfo(size_t quantumFrameSize,
                               AudioBus* outputBus,
                               size_t& quantumFrameOffset,
                               size_t& nonSilentFramesToProcess);
 
     // Called when we have no more sound to play or the noteOff() time has been reached.
     virtual void finish();
 
     static void notifyEndedDispatch(void*);
-    void notifyEnded();
 
     PlaybackState m_playbackState;
 
     // m_startTime is the time to start playing based on the context's timeline (0 or a time less than the context's current time means "now").
     double m_startTime; // in seconds
 
     // m_endTime is the time to stop playing based on the context's timeline (0 or a time less than the context's current time means "now").
     // If it hasn't been set explicitly, then the sound will not stop playing (if looping) or will stop when the end of the AudioBuffer
     // has been reached.
     double m_endTime; // in seconds
 
     bool m_hasEndedListener;
 
     static const double UnknownTime;
 };
 
 } // namespace WebCore
 
 #endif // AudioScheduledSourceNode_h