Bug 674074 - about:memory blank in presence of WebGL contexts - r=njn
authorBenoit Jacob <bjacob@mozilla.com>
Wed, 27 Jul 2011 14:46:15 -0400
changeset 73426 15be41bf71506b983139ddc0ed59e77222afc4b1
parent 73425 533f49000a9ef6ab41bd806fea8c5f1ecdb02059
child 73427 47a266e0a4bd479ff1310aeebe1035f901390b1d
push id20862
push userbjacob@mozilla.com
push dateWed, 27 Jul 2011 18:46:58 +0000
treeherdermozilla-central@15be41bf7150 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs674074
milestone8.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 674074 - about:memory blank in presence of WebGL contexts - r=njn This fixes the names of WebGL KIND_HEAP reporters. Newly enforced rules about the naming of KIND_HEAP reporters were making about:memory fail to work in presence of WebGL reporters.
content/canvas/src/WebGLContext.cpp
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -92,17 +92,17 @@ NS_MEMORY_REPORTER_IMPLEMENT(WebGLTextur
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLBufferMemoryUsed,
                              "webgl-buffer-memory",
                              KIND_OTHER,
                              UNITS_BYTES,
                              WebGLMemoryReporter::GetBufferMemoryUsed,
                              "Memory used by WebGL buffers. The OpenGL implementation is free to store these buffers in either video memory or main memory. This measurement is only a lower bound, actual memory usage may be higher for example if the storage is strided.")
 
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLBufferCacheMemoryUsed,
-                             "webgl-buffer-cache-memory",
+                             "explicit/webgl/buffer-cache-memory",
                              KIND_HEAP,
                              UNITS_BYTES,
                              WebGLMemoryReporter::GetBufferCacheMemoryUsed,
                              "Memory used by WebGL buffer caches. The WebGL implementation caches the contents of element array buffers only. This adds up with the webgl-buffer-memory value, but contrary to it, this one represents bytes on the heap, not managed by OpenGL.")
 
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLBufferCount,
                              "webgl-buffer-count",
                              KIND_OTHER,
@@ -120,24 +120,24 @@ NS_MEMORY_REPORTER_IMPLEMENT(WebGLRender
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLRenderbufferCount,
                              "webgl-renderbuffer-count",
                              KIND_OTHER,
                              UNITS_COUNT,
                              WebGLMemoryReporter::GetRenderbufferCount,
                              "Number of WebGL renderbuffers.")
 
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLShaderSourcesSize,
-                             "webgl-shader-sources-size",
+                             "explicit/webgl/shader-sources-size",
                              KIND_HEAP,
                              UNITS_BYTES,
                              WebGLMemoryReporter::GetShaderSourcesSize,
                              "Combined size of WebGL shader ASCII sources, cached on the heap. This should always be at most a few kilobytes, or dozen kilobytes for very shader-intensive WebGL demos.")
 
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLShaderTranslationLogsSize,
-                             "webgl-shader-translationlogs-size",
+                             "explicit/webgl/shader-translationlogs-size",
                              KIND_HEAP,
                              UNITS_BYTES,
                              WebGLMemoryReporter::GetShaderTranslationLogsSize,
                              "Combined size of WebGL shader ASCII translation logs, cached on the heap.")
 
 NS_MEMORY_REPORTER_IMPLEMENT(WebGLShaderCount,
                              "webgl-shader-count",
                              KIND_OTHER,