Bug 946781 - part 4 - revert measuring the proto and iface cache on nsGlobalWindow (bug 922094); r=me

This commit is contained in:
Nathan Froyd 2013-12-06 13:11:53 -05:00
parent 2c0c4476de
commit 4e5308cf32
3 changed files with 0 additions and 17 deletions

View File

@ -209,7 +209,6 @@
#include "mozilla/dom/WindowBinding.h"
#include "nsITabChild.h"
#include "nsIDOMMediaQueryList.h"
#include "mozilla/dom/DOMJSClass.h"
#ifdef MOZ_WEBSPEECH
#include "mozilla/dom/SpeechSynthesis.h"
@ -12715,13 +12714,6 @@ nsGlobalWindow::AddSizeOfIncludingThis(nsWindowSizes* aWindowSizes) const
const_cast<nsTHashtable<nsPtrHashKey<nsDOMEventTargetHelper> >*>
(&mEventTargetObjects)->EnumerateEntries(CollectSizeAndListenerCount,
aWindowSizes);
JSObject* global = FastGetGlobalJSObject();
if (IsInnerWindow() && global) {
ProtoAndIfaceArray* cache = GetProtoAndIfaceArray(global);
aWindowSizes->mProtoIfaceCacheSize +=
cache->SizeOfIncludingThis(aWindowSizes->mMallocSizeOf);
}
}

View File

@ -310,11 +310,6 @@ CollectWindowReports(nsGlobalWindow *aWindow,
"other 'dom/' numbers.");
aWindowTotalSizes->mDOMOtherSize += windowSizes.mDOMOtherSize;
REPORT_SIZE("/proto-iface-cache", windowSizes.mProtoIfaceCacheSize,
"Memory used for prototype and interface binding caches "
"with a window.");
aWindowTotalSizes->mProtoIfaceCacheSize += windowSizes.mProtoIfaceCacheSize;
REPORT_SIZE("/property-tables",
windowSizes.mPropertyTablesSize,
"Memory used for the property tables within a window.");
@ -529,9 +524,6 @@ nsWindowMemoryReporter::CollectReports(nsIMemoryReporterCallback* aCb,
REPORT("window-objects/dom/other", windowTotalSizes.mDOMOtherSize,
"This is the sum of all windows' 'dom/other' numbers.");
REPORT("window-objects/proto-iface-cache", windowTotalSizes.mProtoIfaceCacheSize,
"This is the sum of all windows' 'proto-iface-cache' numbers.");
REPORT("window-objects/property-tables",
windowTotalSizes.mPropertyTablesSize,
"This is the sum of all windows' 'property-tables' numbers.");

View File

@ -40,7 +40,6 @@ class nsWindowSizes {
macro(Other, mLayoutTextRunsSize) \
macro(Other, mLayoutPresContextSize) \
macro(Other, mPropertyTablesSize) \
macro(Other, mProtoIfaceCacheSize) \
public:
nsWindowSizes(mozilla::MallocSizeOf aMallocSizeOf)