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

Bug 1084136 (Part 7) - Treat being multipart as an image state. r=tn

Browse Source 
--HG--
extra : rebase_source : 2026ffd7698abe21f15dbc52cbf318b52e329129
This commit is contained in:
Seth Fowler 2014-11-06 17:33:59 -08:00
parent c3719cd2ba
commit 10014ce732
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
image/src/imgStatusTracker.cpp
View File

@ -146,7 +146,6 @@ imgStatusTracker::imgStatusTracker(Image* aImage)
: mImage(aImage),
mState(0),
mImageStatus(imgIRequest::STATUS_NONE),
mIsMultipart(false),
mHadLastPart(false),
mHasBeenDecoded(false)
{
@ -158,7 +157,6 @@ imgStatusTracker::imgStatusTracker(const imgStatusTracker& aOther)
: mImage(aOther.mImage),
mState(aOther.mState),
mImageStatus(aOther.mImageStatus),
mIsMultipart(aOther.mIsMultipart),
mHadLastPart(aOther.mHadLastPart),
mHasBeenDecoded(aOther.mHasBeenDecoded)
// Note: we explicitly don't copy several fields:
@ -210,6 +208,11 @@ imgStatusTracker::ResetImage()
mImage = nullptr;
}
void imgStatusTracker::SetIsMultipart()
{
mState |= FLAG_IS_MULTIPART;
}
bool
imgStatusTracker::IsLoading() const
{
@ -423,8 +426,6 @@ imgStatusTracker::Difference(imgStatusTracker* aOther) const
diff.diffState = ~mState & aOther->mState & ~FLAG_REQUEST_STARTED;
diff.diffImageStatus = ~mImageStatus & aOther->mImageStatus;
MOZ_ASSERT(!mIsMultipart || aOther->mIsMultipart, "mIsMultipart should be monotonic");
diff.foundIsMultipart = !mIsMultipart && aOther->mIsMultipart;
diff.foundLastPart = !mHadLastPart && aOther->mHadLastPart;
diff.gotDecoded = !mHasBeenDecoded && aOther->mHasBeenDecoded;
@ -470,7 +471,6 @@ imgStatusTracker::ApplyDifference(const ImageStatusDiff& aDiff)
// Synchronize our state.
mState |= aDiff.diffState | loadState;
mIsMultipart = mIsMultipart || aDiff.foundIsMultipart;
mHadLastPart = mHadLastPart || aDiff.foundLastPart;
mHasBeenDecoded = mHasBeenDecoded || aDiff.gotDecoded;

12
image/src/imgStatusTracker.h
View File

@ -37,7 +37,8 @@ enum {
FLAG_REQUEST_STOPPED = 1u << 5,
FLAG_ONLOAD_BLOCKED = 1u << 6,
FLAG_ONLOAD_UNBLOCKED = 1u << 7,
FLAG_IS_ANIMATED = 1u << 8
FLAG_IS_ANIMATED = 1u << 8,
FLAG_IS_MULTIPART = 1u << 9
};
struct ImageStatusDiff
@ -46,7 +47,6 @@ struct ImageStatusDiff
: invalidRect()
, diffState(0)
, diffImageStatus(0)
, foundIsMultipart(false)
, foundLastPart(false)
, gotDecoded(false)
{ }
@ -59,7 +59,6 @@ struct ImageStatusDiff
return aOther.invalidRect == invalidRect
&& aOther.diffState == diffState
&& aOther.diffImageStatus == diffImageStatus
&& aOther.foundIsMultipart == foundIsMultipart
&& aOther.foundLastPart == foundLastPart
&& aOther.gotDecoded == gotDecoded;
}
@ -68,7 +67,6 @@ struct ImageStatusDiff
invalidRect = invalidRect.Union(aOther.invalidRect);
diffState |= aOther.diffState;
diffImageStatus |= aOther.diffImageStatus;
foundIsMultipart = foundIsMultipart || aOther.foundIsMultipart;
foundLastPart = foundLastPart || aOther.foundLastPart;
gotDecoded = gotDecoded || aOther.gotDecoded;
}
@ -76,7 +74,6 @@ struct ImageStatusDiff
nsIntRect invalidRect;
uint32_t diffState;
uint32_t diffImageStatus;
bool foundIsMultipart : 1;
bool foundLastPart : 1;
bool gotDecoded : 1;
};
@ -120,7 +117,7 @@ public:
void ResetImage();
// Inform this status tracker that it is associated with a multipart image.
void SetIsMultipart() { mIsMultipart = true; }
void SetIsMultipart();
// Schedule an asynchronous "replaying" of all the notifications that would
// have to happen to put us in the current state.
@ -252,7 +249,7 @@ public:
void RecordError();
bool IsMultipart() const { return mIsMultipart; }
bool IsMultipart() const { return mState & mozilla::image::FLAG_IS_MULTIPART; }
// Weak pointer getters - no AddRefs.
inline already_AddRefed<mozilla::image::Image> GetImage() const {
@ -317,7 +314,6 @@ private:
uint32_t mState;
uint32_t mImageStatus;
bool mIsMultipart : 1;
bool mHadLastPart : 1;
bool mHasBeenDecoded : 1;
};