Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag

Source/modules/webaudio/AudioNode.h

 /*
  * Copyright (C) 2010, 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 140 matching lines @@
 
     // Called when a new connection has been made to one of our inputs or the connection number of channels has changed.
     // This potentially gives us enough information to perform a lazy initialization or, if necessary, a re-initialization.
     // Called from main thread.
     virtual void checkNumberOfChannelsForInput(AudioNodeInput*);
 
 #if DEBUG_AUDIONODE_REFERENCES
     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;
     // latencyTime() is the length of time it takes for non-zero output to appear after non-zero input is provided. This only applies to
     // processing delay which is an artifact of the processing algorithm chosen and is *not* part of the intrinsic desired effect. For
     // example, a "delay" effect is expected to delay the signal, and thus would not be considered latency.
     virtual double latencyTime() const = 0;
 
     // propagatesSilence() should return true if the node will generate silent output when given silent input. By default, AudioNode
     // will take tailTime() and latencyTime() into account when determining whether the node will propagate silence.
@@ skipping 46 matching lines @@
 
     double m_lastProcessingTime;
     double m_lastNonSilentTime;
 
 #if !ENABLE(OILPAN)
     // Ref-counting
     volatile int m_normalRefCount;
 #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;
     static int s_nodeCount[NodeTypeEnd];
 #endif
     static unsigned s_instanceCount;
 
 #if !ENABLE(OILPAN)
     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
 #endif
 
 protected:
     unsigned m_channelCount;
     ChannelCountMode m_channelCountMode;
     AudioBus::ChannelInterpretation m_channelInterpretation;
 };
 
 } // namespace blink
 
 #endif // AudioNode_h