Merge 158146 "[XHR] Abort method execution when m_loader->cancel..."

Source/modules/webaudio/AsyncAudioDecoder.cpp

 /*
  * Copyright (C) 2011, 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 36 matching lines @@
 {
 }
 
 void AsyncAudioDecoder::decodeAsync(ArrayBuffer* audioData, float sampleRate, PassRefPtr<AudioBufferCallback> successCallback, PassRefPtr<AudioBufferCallback> errorCallback)
 {
     ASSERT(isMainThread());
     ASSERT(audioData);
     if (!audioData)
         return;
 
+    // Add a ref to keep audioData alive until completion of decoding.
+    RefPtr<ArrayBuffer> audioDataRef(audioData);
+
     // The leak references to successCallback and errorCallback are picked up on notifyComplete.
-    m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioData, sampleRate, successCallback.leakRef(), errorCallback.leakRef())));
+    m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::decode, audioDataRef.release().leakRef(), sampleRate, successCallback.leakRef(), errorCallback.leakRef())));
 }
 
 void AsyncAudioDecoder::decode(ArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback)
 {
     // Do the actual decoding and invoke the callback.
     RefPtr<AudioBuffer> audioBuffer = AudioBuffer::createFromAudioFileData(audioData->data(), audioData->byteLength(), false, sampleRate);
 
     // Decoding is finished, but we need to do the callbacks on the main thread.
     // The leaked reference to audioBuffer is picked up in notifyComplete.
     callOnMainThread(WTF::bind(&AsyncAudioDecoder::notifyComplete, audioData, successCallback, errorCallback, audioBuffer.release().leakRef()));
 }
 
 void AsyncAudioDecoder::notifyComplete(ArrayBuffer* audioData, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, AudioBuffer* audioBuffer)
 {
     // Adopt references, so everything gets correctly dereffed.
     RefPtr<ArrayBuffer> audioDataRef = adoptRef(audioData);
     RefPtr<AudioBufferCallback> successCallbackRef = adoptRef(successCallback);
     RefPtr<AudioBufferCallback> errorCallbackRef = adoptRef(errorCallback);
     RefPtr<AudioBuffer> audioBufferRef = adoptRef(audioBuffer);
 
     if (audioBuffer && successCallback)
         successCallback->handleEvent(audioBuffer);
     else if (errorCallback)
         errorCallback->handleEvent(audioBuffer);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)