| Index: third_party/WebKit/Source/modules/webaudio/AudioNode.h
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.h b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
|
| index 53c2b67d67cbe45dd9a2eac5c7f99343cb45b6b8..49e2aa3d6640214adb0849f5b5dbf4a2c8a25780 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/AudioNode.h
|
| +++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
|
| @@ -107,7 +107,7 @@ public:
|
| // nullptr otherwise. This always returns a valid object in an audio
|
| // rendering thread, and inside dispose(). We must not call context() in
|
| // the destructor.
|
| - AbstractAudioContext* context() const;
|
| + virtual AbstractAudioContext* context() const;
|
| void clearContext() { m_context = nullptr; }
|
|
|
| enum ChannelCountMode {
|
| @@ -229,6 +229,12 @@ protected:
|
| // Force all inputs to take any channel interpretation changes into account.
|
| void updateChannelsForInputs();
|
|
|
| + // This raw pointer is safe because this is cleared for all of live
|
| + // AudioHandlers when the AbstractAudioContext dies. Do not access m_context
|
| + // directly, use context() instead.
|
| + GC_PLUGIN_IGNORE("http://crbug.com/404527")
|
| + AbstractAudioContext* m_context;
|
| +
|
| private:
|
| void setNodeType(NodeType);
|
|
|
| @@ -241,12 +247,6 @@ private:
|
| GC_PLUGIN_IGNORE("http://crbug.com/404527")
|
| AudioNode* m_node;
|
|
|
| - // This raw pointer is safe because this is cleared for all of live
|
| - // AudioHandlers when the AbstractAudioContext dies. Do not access m_context
|
| - // directly, use context() instead.
|
| - GC_PLUGIN_IGNORE("http://crbug.com/404527")
|
| - AbstractAudioContext* m_context;
|
| -
|
| float m_sampleRate;
|
| Vector<OwnPtr<AudioNodeInput>> m_inputs;
|
| Vector<OwnPtr<AudioNodeOutput>> m_outputs;
|
|
|