Backed out changeset 0ee7b97a8a84 (bug 1247405) for bustage. r=bustage on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 25 Feb 2016 19:12:27 +0100
changeset 321951 636081f1b33208ad8f8fa1a537db90911f1873e7
parent 321950 e003524530f63bdbfb84fb4ab63dd0f6909effaf
child 321952 e3235792878fe0f7b434882f8569be7532c88ab1
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1247405
milestone47.0a1
backs out0ee7b97a8a8470c42cfcd00743f08f2e4f5b5dd7
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
Backed out changeset 0ee7b97a8a84 (bug 1247405) for bustage. r=bustage on a CLOSED TREE
gfx/gl/GfxTexturesReporter.cpp
gfx/gl/GfxTexturesReporter.h
--- a/gfx/gl/GfxTexturesReporter.cpp
+++ b/gfx/gl/GfxTexturesReporter.cpp
@@ -11,28 +11,24 @@
 #endif
 
 using namespace mozilla;
 using namespace mozilla::gl;
 
 NS_IMPL_ISUPPORTS(GfxTexturesReporter, nsIMemoryReporter)
 
 Atomic<size_t> GfxTexturesReporter::sAmount(0);
-Atomic<size_t> GfxTexturesReporter::sPeakAmount(0);
 Atomic<size_t> GfxTexturesReporter::sTileWasteAmount(0);
 
 /* static */ void
 GfxTexturesReporter::UpdateAmount(MemoryUse action, size_t amount)
 {
     if (action == MemoryFreed) {
         MOZ_RELEASE_ASSERT(amount <= sAmount);
         sAmount -= amount;
     } else {
         sAmount += amount;
-        if (sAmount > sPeakAmount) {
-            sPeakAmount = sAmount;
-        }
     }
 
 #ifdef MOZ_CRASHREPORTER
     CrashReporter::AnnotateTexturesSize(sAmount);
 #endif
 }
--- a/gfx/gl/GfxTexturesReporter.h
+++ b/gfx/gl/GfxTexturesReporter.h
@@ -48,28 +48,23 @@ public:
     }
 
     NS_IMETHOD CollectReports(nsIHandleReportCallback* aHandleReport,
                               nsISupports* aData, bool aAnonymize) override
     {
         MOZ_COLLECT_REPORT("gfx-tiles-waste", KIND_OTHER, UNITS_BYTES,
             int64_t(sTileWasteAmount),
             "Memory lost due to tiles extending past content boundaries");
-        MOZ_COLLECT_REPORT(
+        return MOZ_COLLECT_REPORT(
             "gfx-textures", KIND_OTHER, UNITS_BYTES, int64_t(sAmount),
             "Memory used for storing GL textures.");
-        MOZ_COLLECT_REPORT(
-            "gfx-textures-peak", KIND_OTHER, UNITS_BYTES, int64_t(sPeakAmount),
-            "Peak memory used for storing GL textures.");
-        return NS_OK;
     }
 
 private:
     static Atomic<size_t> sAmount;
-    static Atomic<size_t> sPeakAmount;
     // Count the amount of memory lost to tile waste
     static Atomic<size_t> sTileWasteAmount;
 };
 
 class GfxTextureWasteTracker {
 public:
   GfxTextureWasteTracker()
     : mBytes(0)