Simplify MediaStreamAudioSourceNode ownerships.

third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 25 matching lines @@
 
 namespace blink {
 
 class BaseAudioContext;
 class MediaStreamAudioSourceOptions;
 
 class MediaStreamAudioSourceHandler final : public AudioHandler {
  public:
   static PassRefPtr<MediaStreamAudioSourceHandler> create(
       AudioNode&,
-      MediaStream&,
-      MediaStreamTrack*,
       std::unique_ptr<AudioSourceProvider>);
   ~MediaStreamAudioSourceHandler() override;
 
-  MediaStream* getMediaStream() { return m_mediaStream.get(); }
-
   // AudioHandler
   void process(size_t framesToProcess) override;
 
   // A helper for AudioSourceProviderClient implementation of
   // MediaStreamAudioSourceNode.
   void setFormat(size_t numberOfChannels, float sampleRate);
 
+ private:
+  MediaStreamAudioSourceHandler(AudioNode&,
+                                std::unique_ptr<AudioSourceProvider>);
+
+  // As an audio source, we will never propagate silence.
+  bool propagatesSilence() const override { return false; }
+
   AudioSourceProvider* getAudioSourceProvider() const {
     return m_audioSourceProvider.get();
   }
 
- private:
-  MediaStreamAudioSourceHandler(AudioNode&,
-                                MediaStream&,
-                                MediaStreamTrack*,
-                                std::unique_ptr<AudioSourceProvider>);
-  // As an audio source, we will never propagate silence.
-  bool propagatesSilence() const override { return false; }
-
-  // These Persistents don't make reference cycles including the owner
-  // MediaStreamAudioSourceNode.
-  Persistent<MediaStream> m_mediaStream;
-  Persistent<MediaStreamTrack> m_audioTrack;
   std::unique_ptr<AudioSourceProvider> m_audioSourceProvider;
 
   Mutex m_processLock;
 
   unsigned m_sourceNumberOfChannels;
 };
 
 class MediaStreamAudioSourceNode final : public AudioNode,
                                          public AudioSourceProviderClient {
   DEFINE_WRAPPERTYPEINFO();
   USING_GARBAGE_COLLECTED_MIXIN(MediaStreamAudioSourceNode);
 
  public:
   static MediaStreamAudioSourceNode* create(BaseAudioContext&,
                                             MediaStream&,
                                             ExceptionState&);
   static MediaStreamAudioSourceNode* create(
       BaseAudioContext*,
       const MediaStreamAudioSourceOptions&,
       ExceptionState&);
 
   DECLARE_VIRTUAL_TRACE();
-  MediaStreamAudioSourceHandler& mediaStreamAudioSourceHandler() const;
 
   MediaStream* getMediaStream() const;
 
   // AudioSourceProviderClient functions:
   void setFormat(size_t numberOfChannels, float sampleRate) override;
 
  private:
   MediaStreamAudioSourceNode(BaseAudioContext&,
                              MediaStream&,
                              MediaStreamTrack*,
                              std::unique_ptr<AudioSourceProvider>);
+
+  MediaStreamAudioSourceHandler& mediaStreamAudioSourceHandler() const;
+
+  Member<MediaStreamTrack> m_audioTrack;
+  Member<MediaStream> m_mediaStream;
 };
 
 }  // namespace blink
 
 #endif  // MediaStreamAudioSourceNode_h