bug 1222202 implement query interface to nsIMemoryReporter r=bz
authorKarl Tomlinson <karlt+@karlt.net>
Mon, 16 Nov 2015 13:08:21 +1300
changeset 273073 eb70b5be4f9171923753d3ac6929af42edd1f9e8
parent 273072 86a46ffd473a4597230a1f638a6fa798ec81fdaa
child 273074 36d61af5021cb891d7e1f0698c8e268a90919cba
push id29693
push usercbook@mozilla.com
push dateWed, 18 Nov 2015 13:50:33 +0000
treeherdermozilla-central@1d6155d7e6c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs1222202
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1222202 implement query interface to nsIMemoryReporter r=bz
dom/media/webaudio/AudioContext.cpp
dom/media/webaudio/test/mochitest.ini
--- a/dom/media/webaudio/AudioContext.cpp
+++ b/dom/media/webaudio/AudioContext.cpp
@@ -69,17 +69,19 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_
     MOZ_ASSERT(tmp->mIsOffline,
                "Online AudioContexts should always be started");
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mActiveNodes)
   }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_ADDREF_INHERITED(AudioContext, DOMEventTargetHelper)
 NS_IMPL_RELEASE_INHERITED(AudioContext, DOMEventTargetHelper)
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(AudioContext)
+  NS_INTERFACE_MAP_ENTRY(nsIMemoryReporter)
 NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
 
 static float GetSampleRateForAudioContext(bool aIsOffline, float aSampleRate)
 {
   if (aIsOffline) {
     return aSampleRate;
   } else {
     CubebUtils::InitPreferredSampleRate();
--- a/dom/media/webaudio/test/mochitest.ini
+++ b/dom/media/webaudio/test/mochitest.ini
@@ -178,9 +178,8 @@ skip-if = (toolkit == 'gonk' && !debug) 
 [test_stereoPanningWithGain.html]
 [test_waveDecoder.html]
 [test_waveShaper.html]
 [test_waveShaperGain.html]
 [test_waveShaperNoCurve.html]
 [test_waveShaperPassThrough.html]
 [test_waveShaperInvalidLengthCurve.html]
 [test_WebAudioMemoryReporting.html]
-skip-if = debug # assertion failures: bug 1222202