Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 04 Nov 2012 22:01:13 -0500
changeset 112291 cecff590fcd642d57ecc77018457373bf2dd027b
parent 112290 837ae727d237e061235d0fb891be68bc995bb847 (current diff)
parent 112281 2937fd8e35a164c4683f69ffc6f2e7bbe325ffef (diff)
child 112292 e8f94aee02aa390f50a287acfd182a5eb34f3bf9
push id23809
push useremorley@mozilla.com
push dateMon, 05 Nov 2012 15:24:12 +0000
treeherdermozilla-central@358c9830d166 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone19.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
Merge m-c to inbound.
--- a/image/src/DiscardTracker.cpp
+++ b/image/src/DiscardTracker.cpp
@@ -97,16 +97,20 @@ void
 DiscardTracker::Shutdown()
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   if (sTimer) {
     sTimer->Cancel();
     sTimer = NULL;
   }
+
+  // Clear the sDiscardableImages linked list so that its destructor
+  // (LinkedList.h) finds an empty array, which is required after bug 803688.
+  DiscardAll();
 }
 
 /*
  * Discard all the images we're tracking.
  */
 void
 DiscardTracker::DiscardAll()
 {