Bug 716140 - Remove explicit imgStatusTracker::mBlockingOnload, as it's implied by stateBlockingOnload. r=khuey

--HG--
extra : rebase_source : 4368c09438bd6cb288a0c845ff20cb8a3f0c5560

image/src/imgStatusTracker.cpp

@@ -48,9 +48,6 @@ public:
     }
 
     if (!mTracker->IsMultipart()) {
-      MOZ_ASSERT(!mTracker->mBlockingOnload);
-      mTracker->mBlockingOnload = true;
-
       mTracker->RecordBlockOnload();
 
       nsTObserverArray<imgRequestProxy*>::ForwardIterator iter(mTracker->mConsumers);
@@ -198,22 +195,19 @@ private:
 
 imgStatusTracker::imgStatusTracker(Image* aImage)
   : mImage(aImage),
+    mTrackerObserver(new imgStatusTrackerObserver(this)),
     mState(0),
     mImageStatus(imgIRequest::STATUS_NONE),
     mIsMultipart(false),
-    mHadLastPart(false),
-    mBlockingOnload(false)
-{
-  mTrackerObserver = new imgStatusTrackerObserver(this);
-}
+    mHadLastPart(false)
+{}
 
 imgStatusTracker::imgStatusTracker(const imgStatusTracker& aOther)
   : mImage(aOther.mImage),
     mState(aOther.mState),
     mImageStatus(aOther.mImageStatus),
     mIsMultipart(aOther.mIsMultipart),
-    mHadLastPart(aOther.mHadLastPart),
-    mBlockingOnload(aOther.mBlockingOnload)
+    mHadLastPart(aOther.mHadLastPart)
     // Note: we explicitly don't copy mRequestRunnable, because it won't be
     // nulled out when the mRequestRunnable's Run function eventually gets
     // called.
@@ -763,12 +757,10 @@ imgStatusTracker::SendUnblockOnload(imgRequestProxy* aProxy)
 void
 imgStatusTracker::MaybeUnblockOnload()
 {
-  if (!mBlockingOnload) {
+  if (!(mState & stateBlockingOnload)) {
     return;
   }
 
-  mBlockingOnload = false;
-
   RecordUnblockOnload();
 
   nsTObserverArray<imgRequestProxy*>::ForwardIterator iter(mConsumers);

image/src/imgStatusTracker.h

@@ -200,7 +200,6 @@ private:
   uint32_t mImageStatus;
   bool mIsMultipart    : 1;
   bool mHadLastPart    : 1;
-  bool mBlockingOnload : 1;
 };
 
 #endif