summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/modules/webaudio
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/WebKit/Source/modules/webaudio')
-rw-r--r--third_party/WebKit/Source/modules/webaudio/AudioContext.cpp27
-rw-r--r--third_party/WebKit/Source/modules/webaudio/AudioContext.h2
-rw-r--r--third_party/WebKit/Source/modules/webaudio/AudioNode.cpp10
-rw-r--r--third_party/WebKit/Source/modules/webaudio/AudioNode.h2
4 files changed, 0 insertions, 41 deletions
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
index 16bf9e9..49b4878 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.cpp
@@ -30,7 +30,6 @@
#include "core/dom/Document.h"
#include "core/dom/ExceptionCode.h"
-#include "core/dom/WebCoreMemoryInstrumentation.h"
#include "core/html/HTMLMediaElement.h"
#include "core/inspector/ScriptCallStack.h"
#include "core/platform/audio/FFTFrame.h"
@@ -63,8 +62,6 @@
#include "modules/webaudio/PeriodicWave.h"
#include "modules/webaudio/ScriptProcessorNode.h"
#include "modules/webaudio/WaveShaperNode.h"
-#include "wtf/MemoryInstrumentationHashSet.h"
-#include "wtf/MemoryInstrumentationVector.h"
#if DEBUG_AUDIONODE_REFERENCES
#include <stdio.h>
@@ -959,30 +956,6 @@ void AudioContext::decrementActiveSourceCount()
atomicDecrement(&m_activeSourceCount);
}
-void AudioContext::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-{
- AutoLocker locker(const_cast<AudioContext*>(this));
-
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Audio);
- ActiveDOMObject::reportMemoryUsage(memoryObjectInfo);
- info.addMember(m_destinationNode, "destinationNode");
- info.addMember(m_listener, "listener");
- info.addMember(m_finishedNodes, "finishedNodes");
- info.addMember(m_referencedNodes, "referencedNodes");
- info.addMember(m_nodesMarkedForDeletion, "nodesMarkedForDeletion");
- info.addMember(m_nodesToDelete, "nodesToDelete");
- info.addMember(m_dirtySummingJunctions, "dirtySummingJunctions");
- info.addMember(m_dirtyAudioNodeOutputs, "dirtyAudioNodeOutputs");
- info.addMember(m_automaticPullNodes, "automaticPullNodes");
- info.addMember(m_renderingAutomaticPullNodes, "renderingAutomaticPullNodes");
- info.addMember(m_contextGraphMutex, "contextGraphMutex");
- info.addMember(m_deferredFinishDerefList, "deferredFinishDerefList");
- info.addMember(m_hrtfDatabaseLoader, "hrtfDatabaseLoader");
- info.addMember(m_eventTargetData, "eventTargetData");
- info.addMember(m_renderTarget, "renderTarget");
- info.addMember(m_audioDecoder, "audioDecoder");
-}
-
} // namespace WebCore
#endif // ENABLE(WEB_AUDIO)
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioContext.h b/third_party/WebKit/Source/modules/webaudio/AudioContext.h
index cde1de8..ad974a3 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioContext.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioContext.h
@@ -247,8 +247,6 @@ public:
static unsigned s_hardwareContextCount;
- virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
-
protected:
explicit AudioContext(Document*);
AudioContext(Document*, unsigned numberOfChannels, size_t numberOfFrames, float sampleRate);
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
index 460f772..406b2db 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.cpp
@@ -29,14 +29,12 @@
#include "modules/webaudio/AudioNode.h"
#include "core/dom/ExceptionCode.h"
-#include "core/dom/WebCoreMemoryInstrumentation.h"
#include "modules/webaudio/AudioContext.h"
#include "modules/webaudio/AudioNodeInput.h"
#include "modules/webaudio/AudioNodeOutput.h"
#include "modules/webaudio/AudioParam.h"
#include "wtf/Atomics.h"
#include "wtf/MainThread.h"
-#include "wtf/MemoryInstrumentationVector.h"
#if DEBUG_AUDIONODE_REFERENCES
#include <stdio.h>
@@ -504,14 +502,6 @@ void AudioNode::finishDeref(RefType refType)
}
}
-void AudioNode::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-{
- MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Audio);
- info.addMember(m_context, "context");
- info.addMember(m_inputs, "inputs");
- info.addMember(m_outputs, "outputs");
-}
-
#if DEBUG_AUDIONODE_REFERENCES
bool AudioNode::s_isNodeCountInitialized = false;
diff --git a/third_party/WebKit/Source/modules/webaudio/AudioNode.h b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
index 9be358d..316e2f8 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioNode.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioNode.h
@@ -168,8 +168,6 @@ public:
void enableOutputsIfNecessary();
void disableOutputsIfNecessary();
- void reportMemoryUsage(MemoryObjectInfo*) const;
-
unsigned long channelCount();
virtual void setChannelCount(unsigned long, ExceptionCode&);