Add WebThread in AudioDestination to support AudioWorkletThread

third_party/WebKit/Source/platform/audio/PushPullFIFO.h

Index: third_party/WebKit/Source/platform/audio/PushPullFIFO.h
diff --git a/third_party/WebKit/Source/platform/audio/PushPullFIFO.h b/third_party/WebKit/Source/platform/audio/PushPullFIFO.h
index 447ee221e9f764bcf27b1e72a6ccbc934bd167b9..eff9d1bbd3a3faada72725c69379c7fb2909dbb1 100644
--- a/third_party/WebKit/Source/platform/audio/PushPullFIFO.h
+++ b/third_party/WebKit/Source/platform/audio/PushPullFIFO.h
@@ -7,8 +7,12 @@
 
 #include "platform/audio/AudioBus.h"
 #include "platform/wtf/Allocator.h"
+#include "platform/wtf/Threading.h"
+#include "platform/wtf/ThreadingPrimitives.h"
 #include "public/platform/WebCommon.h"
 
+#include "platform/audio/AudioIOCallback.h"
+
 namespace blink {
 
 // A configuration data container for PushPullFIFO unit test.
@@ -26,6 +30,14 @@ struct PushPullFIFOStateForTest {
 // Blink-WebAudio and the renderer. The renderer's hardware callback buffer size
 // varies on the platform, but the WebAudio always renders 128 frames (render
 // quantum, RQ) thus FIFO is needed to handle the general case.
+//
+// Note that this object is concurrently accessed by two threads; WebAudio
+// rendering thread (WebThread) in Blink and the audio device thread
+// (AudioDeviceThread) from the media renderer. The push/pull operations touch
+// most of variables in the class (index_write_, index_read_, frames_available_,
+// and fifo_Bus_) so the thread safety must be handled with care.
+//
+// TODO(hongchan): add a unit test for multi-thread access.
 class BLINK_PLATFORM_EXPORT PushPullFIFO {
   USING_FAST_MALLOC(PushPullFIFO);
   WTF_MAKE_NONCOPYABLE(PushPullFIFO);
@@ -34,40 +46,60 @@ class BLINK_PLATFORM_EXPORT PushPullFIFO {
   // Maximum FIFO length. (512 render quanta)
   static const size_t kMaxFIFOLength;
 
-  // |fifoLength| cannot exceed |kMaxFIFOLength|. Otherwise it crashes.
-  explicit PushPullFIFO(unsigned number_of_channels, size_t fifo_length);
+  // |fifo_length| cannot exceed |kMaxFIFOLength|. Otherwise it crashes.
+  explicit PushPullFIFO(unsigned number_of_channels,
+                        size_t fifo_length,
+                        ThreadIdentifier rendering_thread_id,
+                        AudioIOCallback& web_audio_render_callback);
   ~PushPullFIFO();
 
-  // Pushes the rendered frames by WebAudio engine.
-  //  - The |inputBus| length is 128 frames (1 render quantum), fixed.
+  void FillRequestedFrames(size_t frames_requested,
+                           size_t callback_buffer_size,
+                           AudioIOPosition output_position);
+
+  // Pushes the rendered frames by WebAudio rendering thread.
+  //  - The |input_bus| length is 128 frames (1 render quantum), fixed.
   //  - In case of overflow (FIFO full while push), the existing frames in FIFO
-  //    will be overwritten and |indexRead| will be forcibly moved to
-  //    |indexWrite| to avoid reading overwritten frames.
+  //    will be overwritten and |index_read_| will be forcibly moved to
+  //    |index_write_| to avoid reading overwritten frames.
   void Push(const AudioBus* input_bus);
 
-  // Pulling |framesRequested| by the audio device thread.
-  //  - If |framesRequested| is bigger than the length of |outputBus|, it
+  // Pulling |frames_requested| by the audio device thread.
+  //  - If |frames_requested| is bigger than the length of |output_bus|, it
   //    violates SECURITY_CHECK().
-  //  - If |framesRequested| is bigger than FIFO length, it violates
+  //  - If |frames_requested| is bigger than FIFO length, it violates
   //    SECURITY_CHECK().
   //  - In case of underflow (FIFO empty while pull), the remaining space in the
   //    requested output bus will be filled with silence. Thus it will fulfill
   //    the request from the consumer without causing error, but with a glitch.
   void Pull(AudioBus* output_bus, size_t frames_requested);
 
-  size_t FramesAvailable() const { return frames_available_; }
   size_t length() const { return fifo_length_; }
   unsigned NumberOfChannels() const { return fifo_bus_->NumberOfChannels(); }
-  AudioBus* Bus() const { return fifo_bus_.Get(); }
+  AudioBus* GetFIFOBusForTest() const;
 
   // For unit test. Get the current configuration that consists of FIFO length,
   // number of channels, read/write index position and under/overflow count.
   const PushPullFIFOStateForTest GetStateForTest() const;
 
  private:
+  bool IsRenderingThread();
+
+  // This lock protects: fifo_bus_, frames_available_, index_read_ and
+  // index_write_.
+  mutable Mutex lock_;
+
+  const ThreadIdentifier rendering_thread_id_;
+
+  // The render callback function of WebAudio engine. (i.e. DestinationNode)
+  AudioIOCallback& web_audio_render_callback_;
+
   // The size of the FIFO.
   const size_t fifo_length_ = 0;
 
+  // To push the rendered result from WebAudio graph into the FIFO.
+  RefPtr<AudioBus> render_bus_;
+
   RefPtr<AudioBus> fifo_bus_;
 
   // The number of frames in the FIFO actually available for pulling.