Merge for build bustage fix

This commit is contained in:
Peter Annema 2009-02-22 09:07:08 -08:00
commit db76c52702

View File

@ -551,8 +551,9 @@ nsFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
const nsStyleBackground *newBG = GetStyleBackground(); const nsStyleBackground *newBG = GetStyleBackground();
NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, oldBG) { NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, oldBG) {
imgIRequest *oldImage = oldBG->mLayers[i].mImage.mRequest; imgIRequest *oldImage = oldBG->mLayers[i].mImage.mRequest;
imgIRequest *newImage = imgIRequest *newImage = i < newBG->mImageCount
(i < newBG->mImageCount) ? newBG->mLayers[i].mImage.mRequest : nsnull; ? newBG->mLayers[i].mImage.mRequest.get()
: nsnull;
if (oldImage && !EqualImages(oldImage, newImage)) { if (oldImage && !EqualImages(oldImage, newImage)) {
// stop the image loading for the frame, the image has changed // stop the image loading for the frame, the image has changed
PresContext()->SetImageLoaders(this, PresContext()->SetImageLoaders(this,