Bug 661101 backout a part of 9014863a7e2a which was included to the mq file unexpectedly

layout/generic/nsImageFrame.cpp

@@ -1887,7 +1887,6 @@ static const char* kIconLoadPrefs[] = {
 
 nsImageFrame::IconLoad::IconLoad()
 {
-  mHasShutdown = PR_FALSE;
   // register observers
   Preferences::AddStrongObservers(this, kIconLoadPrefs);
   GetPrefs();
@@ -1896,10 +1895,6 @@ nsImageFrame::IconLoad::IconLoad()
 void
 nsImageFrame::IconLoad::Shutdown()
 {
-  if (mHasShutdown) {
-    return;
-  }
-  mHasShutdown = PR_TRUE;
   Preferences::RemoveObservers(this, kIconLoadPrefs);
   // in case the pref service releases us later
   if (mLoadingImage) {

layout/generic/nsImageFrame.h

@@ -327,10 +327,6 @@ private:
     // broken image and loading image icons
   public:
     IconLoad();
-    ~IconLoad()
-    {
-      Shutdown();
-    }
 
     void Shutdown();
 
@@ -363,7 +359,6 @@ private:
     nsCOMPtr<imgIRequest> mBrokenImage;
     PRPackedBool     mPrefForceInlineAltText;
     PRPackedBool     mPrefShowPlaceholders;
-    PRPackedBool     mHasShutdown;
   };
   
 public: