Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1643)

Unified Diff: Source/modules/webaudio/AudioNode.h

Issue 460303003: Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/modules/webaudio/AudioNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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; }
// 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;
« no previous file with comments | « no previous file | Source/modules/webaudio/AudioNode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698