Bug 745141 - Make DiscardTracker::InformAllocation a nop, disabling bug 732820. r=joe, a=akeybl
authorJustin Lebar <justin.lebar@gmail.com>
Sun, 06 May 2012 21:45:24 -0700
changeset 96116 22bc961260730dca599165fddc770613295a9f72
parent 96115 fb8127fcaac4c2541101feff966b98a038baa619
child 96117 88da07e9d9eadb6567b582f91f4ea20b5e359b19
push id160
push userlsblakk@mozilla.com
push dateFri, 13 Jul 2012 18:18:57 +0000
treeherdermozilla-release@228ba1a111fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe, akeybl
bugs745141, 732820
milestone14.0a2
Bug 745141 - Make DiscardTracker::InformAllocation a nop, disabling bug 732820. r=joe, a=akeybl
image/src/DiscardTracker.cpp
--- a/image/src/DiscardTracker.cpp
+++ b/image/src/DiscardTracker.cpp
@@ -123,22 +123,18 @@ DiscardTracker::DiscardAll()
   DisableTimer();
 }
 
 void
 DiscardTracker::InformAllocation(PRInt64 bytes)
 {
   // This function is called back e.g. from RasterImage::Discard(); be careful!
 
-  sCurrentDecodedImageBytes += bytes;
-  MOZ_ASSERT(sCurrentDecodedImageBytes >= 0);
-
-  // If we're using too much memory for decoded images, MaybeDiscardSoon will
-  // enqueue a callback to discard some images.
-  MaybeDiscardSoon();
+  // This function was made into a nop for the FF14 branch.  See bug 745141
+  // comments 54-56.
 }
 
 /**
  * Initialize the tracker.
  */
 nsresult
 DiscardTracker::Initialize()
 {