Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag

Source/modules/webaudio/AudioNode.h

Index: Source/modules/webaudio/AudioNode.h
diff --git a/Source/modules/webaudio/AudioNode.h b/Source/modules/webaudio/AudioNode.h
index 54ef9410c30342e2ac4bfbff93b7250d0b1983ba..8bf98958866bcfb454808e36db0afaa9a729f0a6 100644
--- a/Source/modules/webaudio/AudioNode.h
+++ b/Source/modules/webaudio/AudioNode.h
@@ -158,9 +158,7 @@ public:
     static void printNodeCounts();
 #endif
 
-#if !ENABLE(OILPAN)
-    bool isMarkedForDeletion() const { return m_isMarkedForDeletion; }
-#endif
+    bool isDisposeCalled() const { return m_isDisposeCalled; }

[haraken, 2014/08/12 14:29:52]

Nit: I renamed m_didCallDispose to m_isDisposeCalled, because "didCallDispose"
implies that it's a method called after dispose() is called.

 
     // tailTime() is the length of time (not counting latency time) where non-zero output may occur after continuous silent input.
     virtual double tailTime() const = 0;
@@ -227,14 +225,8 @@ private:
 #endif
     volatile int m_connectionRefCount;
 
-#if !ENABLE(OILPAN)
-    bool m_isMarkedForDeletion;
-#endif
     bool m_isDisabled;
-
-#if ENABLE(ASSERT)
-    bool m_didCallDispose;
-#endif
+    bool m_isDisposeCalled;
 
 #if DEBUG_AUDIONODE_REFERENCES
     static bool s_isNodeCountInitialized;