Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1177604 - Stop delaying the load event for XUL images until the image is decoded. r=tn

Browse Source
This commit is contained in:
Seth Fowler 2015-07-06 17:11:11 -07:00
parent bdb164e9fd
commit 11328ae7f5
2 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
layout/xul/nsImageBoxFrame.cpp
View File

@ -152,8 +152,7 @@ nsImageBoxFrame::nsImageBoxFrame(nsStyleContext* aContext):
mLoadFlags(nsIRequest::LOAD_NORMAL),
mRequestRegistered(false),
mUseSrcAttr(false),
mSuppressStyleCheck(false),
mFireEventOnDecode(false)
mSuppressStyleCheck(false)
{
MarkIntrinsicISizesDirty();
}
@ -772,52 +771,23 @@ nsImageBoxFrame::OnSizeAvailable(imgIRequest* aRequest, imgIContainer* aImage)
nsresult
nsImageBoxFrame::OnDecodeComplete(imgIRequest* aRequest)
{
if (mFireEventOnDecode) {
mFireEventOnDecode = false;
uint32_t reqStatus;
aRequest->GetImageStatus(&reqStatus);
if (!(reqStatus & imgIRequest::STATUS_ERROR)) {
FireImageDOMEvent(mContent, NS_LOAD);
} else {
// Fire an onerror DOM event.
mIntrinsicSize.SizeTo(0, 0);
PresContext()->PresShell()->
FrameNeedsReflow(this, nsIPresShell::eStyleChange, NS_FRAME_IS_DIRTY);
FireImageDOMEvent(mContent, NS_LOAD_ERROR);
}
}
nsBoxLayoutState state(PresContext());
this->Redraw(state);
return NS_OK;
}
nsresult
nsImageBoxFrame::OnLoadComplete(imgIRequest* aRequest, nsresult aStatus)
{
uint32_t reqStatus;
aRequest->GetImageStatus(&reqStatus);
// We want to give the decoder a chance to find errors. If we haven't found
// an error yet and we've already started decoding, we must only fire these
// events after we finish decoding.
if (NS_SUCCEEDED(aStatus) && !(reqStatus & imgIRequest::STATUS_ERROR) &&
(reqStatus & imgIRequest::STATUS_DECODE_STARTED) &&
!(reqStatus & imgIRequest::STATUS_DECODE_COMPLETE)) {
mFireEventOnDecode = true;
if (NS_SUCCEEDED(aStatus)) {
// Fire an onload DOM event.
FireImageDOMEvent(mContent, NS_LOAD);
} else {
if (NS_SUCCEEDED(aStatus)) {
// Fire an onload DOM event.
FireImageDOMEvent(mContent, NS_LOAD);
} else {
// Fire an onerror DOM event.
mIntrinsicSize.SizeTo(0, 0);
PresContext()->PresShell()->
FrameNeedsReflow(this, nsIPresShell::eStyleChange, NS_FRAME_IS_DIRTY);
FireImageDOMEvent(mContent, NS_LOAD_ERROR);
}
// Fire an onerror DOM event.
mIntrinsicSize.SizeTo(0, 0);
PresContext()->PresShell()->
FrameNeedsReflow(this, nsIPresShell::eStyleChange, NS_FRAME_IS_DIRTY);
FireImageDOMEvent(mContent, NS_LOAD_ERROR);
}
return NS_OK;

1
layout/xul/nsImageBoxFrame.h
View File

@ -127,7 +127,6 @@ private:
bool mUseSrcAttr; ///< Whether or not the image src comes from an attribute.
bool mSuppressStyleCheck;
bool mFireEventOnDecode;
}; // class nsImageBoxFrame
class nsDisplayXULImage : public nsDisplayImageContainer {