Bug 1312770 - Part 2, slightly increase loading priority for images that need size information for layout. r?tnikkel
MozReview-Commit-ID: JOpzYtZzH6o
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -279,17 +279,24 @@ nsImageFrame::Init(nsIContent* aCo
// that it can register images.
imageLoader->FrameCreated(this);
// Give image loads associated with an image frame a small priority boost!
nsCOMPtr<imgIRequest> currentRequest;
imageLoader->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
getter_AddRefs(currentRequest));
if (currentRequest) {
- currentRequest->ForceAdjustPriority(-1);
+ int32_t delta = -1;
+
+ // Increase load priority further if intrinsic size might be important for layout.
+ if (!HaveSpecifiedSize(StylePosition())) {
+ --delta;
+ }
+
+ currentRequest->ForceAdjustPriority(delta);
}
}
bool
nsImageFrame::UpdateIntrinsicSize(imgIContainer* aImage)
{
NS_PRECONDITION(aImage, "null image");
if (!aImage)