Bug 866463 - Remove the initial incorrect assignment. r=joe
authorISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
Wed, 08 May 2013 09:14:26 -0400
changeset 142203 7c964beb8d3ec5c5d2a801054edbe0abbb4e6e77
parent 142202 97e73b69c2792fc8d89ac0bcf8ced463c72eba09
child 142204 0f990be99e7b2b8a5200ec6402bb191b76237333
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs866463
milestone23.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
Bug 866463 - Remove the initial incorrect assignment. r=joe
image/src/imgStatusTracker.cpp
--- a/image/src/imgStatusTracker.cpp
+++ b/image/src/imgStatusTracker.cpp
@@ -535,17 +535,17 @@ imgStatusTracker::CalculateAndApplyDiffe
   // Now that we've calculated the difference in state, synchronize our state
   // with the other tracker.
 
   // First, actually synchronize our state.
   mState |= diff.mDiffState | loadState;
   if (diff.mUnblockedOnload) {
     mState &= ~stateBlockingOnload;
   }
-  mImageStatus = other->mImageStatus;
+
   mIsMultipart = other->mIsMultipart;
   mHadLastPart = other->mHadLastPart;
   mImageStatus |= other->mImageStatus;
   mHasBeenDecoded = mHasBeenDecoded || other->mHasBeenDecoded;
 
   // The error state is sticky and overrides all other bits.
   if (mImageStatus & imgIRequest::STATUS_ERROR) {
     mImageStatus = imgIRequest::STATUS_ERROR;