Move webaudio to oilpan

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 23 matching lines @@
 #include "public/platform/Platform.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/MainThread.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 AsyncAudioDecoder::AsyncAudioDecoder()
     : m_thread(adoptPtr(blink::Platform::current()->createThread("Audio Decoder")))
 {
+    m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::setupAudioDecoderThread)));

[keishi, 2014/03/19 20:33:45]

Adding this line fixes an assertion failure but causes many tests to timeout.
The tests seem to get stuck in
WebCore::SafePointBarrier::parkOthers(ThreadState.cpp:131).
I'm not sure how to fix this. Maybe I'm not calling ThreadState::detach
properly?

[haraken, 2014/03/19 21:03:47]

Looks like you're hitting dead lock.

Isn't there any place where the audio thread waits for something to happen? Then
you need to enter a safe point before doing the wait. Otherwise, a dead lock can
happen because other threads wait for the audio thread to enter a safe point but
the audio thread is waiting for something (and thus never enters the safe
point).

See
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

 }
 
 AsyncAudioDecoder::~AsyncAudioDecoder()
 {
+    m_thread->postTask(new Task(WTF::bind(&AsyncAudioDecoder::cleanupAudioDecoderThread)));
+}
+
+void AsyncAudioDecoder::setupAudioDecoderThread()
+{
+    ThreadState::attach();
+}
+
+void AsyncAudioDecoder::cleanupAudioDecoderThread()
+{
+    ThreadState::detach();
 }
 
 void AsyncAudioDecoder::decodeAsync(ArrayBuffer* audioData, float sampleRate, PassOwnPtr<AudioBufferCallback> successCallback, PassOwnPtr<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, audioDataRef.release().leakRef(), sampleRate, successCallback.leakPtr(), errorCallback.leakPtr())));
 }
 
 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);
+    RefPtrWillBeRawPtr<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);
     OwnPtr<AudioBufferCallback> successCallbackPtr = adoptPtr(successCallback);
     OwnPtr<AudioBufferCallback> errorCallbackPtr = adoptPtr(errorCallback);
-    RefPtr<AudioBuffer> audioBufferRef = adoptRef(audioBuffer);
+#if !ENABLE(OILPAN)
+    RefPtrWillBeRawPtr<AudioBuffer> audioBufferRef = adoptRefWillBeNoop(audioBuffer);
+#endif
 
     if (audioBuffer && successCallback)
         successCallback->handleEvent(audioBuffer);
     else if (errorCallback)
         errorCallback->handleEvent(audioBuffer);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)