Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webaudio / AudioSummingJunction.h

diff --git a/src/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h b/src/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
index d3f3925..982c674 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
+++ b/src/third_party/WebKit/Source/modules/webaudio/AudioSummingJunction.h
@@ -26,20 +26,22 @@
 #define AudioSummingJunction_h
 
 #include "platform/audio/AudioBus.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashSet.h"
 #include "wtf/Vector.h"
 
-namespace WebCore {
+namespace blink {
 
 class AudioContext;
 class AudioNodeOutput;
 
 // An AudioSummingJunction represents a point where zero, one, or more AudioNodeOutputs connect.
 
-class AudioSummingJunction {
+class AudioSummingJunction : public GarbageCollectedFinalized<AudioSummingJunction> {
 public:
-    explicit AudioSummingJunction(AudioContext*);
     virtual ~AudioSummingJunction();
+    virtual void trace(Visitor*);
+    void dispose();
 
     // Can be called from any thread.
     AudioContext* context() { return m_context.get(); }
@@ -56,26 +58,35 @@ public:
     AudioNodeOutput* renderingOutput(unsigned i) { return m_renderingOutputs[i]; }
     bool isConnected() const { return numberOfRenderingConnections() > 0; }
 
-    virtual bool canUpdateState() = 0;
     virtual void didUpdate() = 0;
 
 protected:
-    RefPtr<AudioContext> m_context;
+    explicit AudioSummingJunction(AudioContext*);
+
+    Member<AudioContext> m_context;
 
     // m_outputs contains the AudioNodeOutputs representing current connections which are not disabled.
     // The rendering code should never use this directly, but instead uses m_renderingOutputs.
+    // Oilpan: Since items are added to the hash set by the audio thread (not registered to Oilpan),
+    // we cannot use a HeapHashSet.
+    GC_PLUGIN_IGNORE("http://crbug.com/404527")
     HashSet<AudioNodeOutput*> m_outputs;
 
     // m_renderingOutputs is a copy of m_outputs which will never be modified during the graph rendering on the audio thread.
     // This is the list which is used by the rendering code.
     // Whenever m_outputs is modified, the context is told so it can later update m_renderingOutputs from m_outputs at a safe time.
     // Most of the time, m_renderingOutputs is identical to m_outputs.
+    // Oilpan: Since items are added to the vector by the audio thread (not registered to Oilpan),
+    // we cannot use a HeapVector.
+    GC_PLUGIN_IGNORE("http://crbug.com/404527")
     Vector<AudioNodeOutput*> m_renderingOutputs;
 
     // m_renderingStateNeedUpdating keeps track if m_outputs is modified.
     bool m_renderingStateNeedUpdating;
+
+    bool m_didCallDispose;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // AudioSummingJunction_h