Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
--HG--
extra : rebase_source : 4368c09438bd6cb288a0c845ff20cb8a3f0c5560
This commit is contained in:
Joe Drew 2012-12-20 11:49:26 -05:00
parent b56f5d3a1f
commit adf62cd6b9
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
image/src/imgStatusTracker.cpp
View File

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

1
image/src/imgStatusTracker.h
View File

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