зеркало из https://github.com/mozilla/gecko-dev.git
Putting my changes back in since it made no difference in the orange-ish nature of certain linux tinderboxes. (pchen said it was ok, so there.)
This commit is contained in:
Родитель
cc363b49ad
Коммит
6ef49213e3
|
@ -145,6 +145,16 @@ nsHTMLImageLoader::Update(nsIPresContext* aPresContext,
|
|||
aStatus, mImageLoader, mCallBack,
|
||||
mFlags.mSquelchCallback ? "yes" : "no");
|
||||
#endif
|
||||
|
||||
if (!mFlags.mNeedSizeNotification &&
|
||||
NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE & aStatus) {
|
||||
// remove the size available bit since it is not needed
|
||||
aStatus &= ~NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE;
|
||||
// check if any status left
|
||||
if (aStatus == NS_IMAGE_LOAD_STATUS_NONE)
|
||||
return;
|
||||
}
|
||||
|
||||
if (NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE & aStatus) {
|
||||
if (mImageLoader) {
|
||||
mImageLoader->GetSize(mIntrinsicImageSize);
|
||||
|
@ -152,10 +162,6 @@ nsHTMLImageLoader::Update(nsIPresContext* aPresContext,
|
|||
mFlags.mHaveIntrinsicImageSize = PR_TRUE;
|
||||
}
|
||||
}
|
||||
if ((NS_IMAGE_LOAD_STATUS_SIZE_AVAILABLE == aStatus) &&
|
||||
!mFlags.mNeedSizeNotification) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Pass on update to the user of this object if they want it
|
||||
|
|
Загрузка…
Ссылка в новой задаче