mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Bug 800603: Just check rv (not rv & outparam) after calling imgIRequest:GetImage & GetImagePrincipal. r=jrmuizel
This commit is contained in:
parent
8e45bef98a
commit
1418ffbc8e
@ -2834,8 +2834,8 @@ DrawBorderImage(nsPresContext* aPresContext,
|
|||||||
// Get the actual image.
|
// Get the actual image.
|
||||||
|
|
||||||
nsCOMPtr<imgIContainer> imgContainer;
|
nsCOMPtr<imgIContainer> imgContainer;
|
||||||
req->GetImage(getter_AddRefs(imgContainer));
|
DebugOnly<nsresult> rv = req->GetImage(getter_AddRefs(imgContainer));
|
||||||
NS_ASSERTION(imgContainer, "no image to draw");
|
NS_ASSERTION(NS_SUCCEEDED(rv) && imgContainer, "no image to draw");
|
||||||
|
|
||||||
nsIntSize imageSize;
|
nsIntSize imageSize;
|
||||||
if (NS_FAILED(imgContainer->GetWidth(&imageSize.width))) {
|
if (NS_FAILED(imgContainer->GetWidth(&imageSize.width))) {
|
||||||
@ -4033,7 +4033,7 @@ nsImageRenderer::PrepareImage()
|
|||||||
nsCOMPtr<imgIContainer> img;
|
nsCOMPtr<imgIContainer> img;
|
||||||
if (!((mFlags & FLAG_SYNC_DECODE_IMAGES) &&
|
if (!((mFlags & FLAG_SYNC_DECODE_IMAGES) &&
|
||||||
(mType == eStyleImageType_Image) &&
|
(mType == eStyleImageType_Image) &&
|
||||||
(NS_SUCCEEDED(mImage->GetImageData()->GetImage(getter_AddRefs(img))) && img)))
|
(NS_SUCCEEDED(mImage->GetImageData()->GetImage(getter_AddRefs(img))))))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4042,9 +4042,11 @@ nsImageRenderer::PrepareImage()
|
|||||||
case eStyleImageType_Image:
|
case eStyleImageType_Image:
|
||||||
{
|
{
|
||||||
nsCOMPtr<imgIContainer> srcImage;
|
nsCOMPtr<imgIContainer> srcImage;
|
||||||
mImage->GetImageData()->GetImage(getter_AddRefs(srcImage));
|
DebugOnly<nsresult> rv =
|
||||||
NS_ABORT_IF_FALSE(srcImage, "If srcImage is null, mImage->IsComplete() "
|
mImage->GetImageData()->GetImage(getter_AddRefs(srcImage));
|
||||||
"should have returned false");
|
NS_ABORT_IF_FALSE(NS_SUCCEEDED(rv) && srcImage,
|
||||||
|
"If GetImage() is failing, mImage->IsComplete() "
|
||||||
|
"should have returned false");
|
||||||
|
|
||||||
if (!mImage->GetCropRect()) {
|
if (!mImage->GetCropRect()) {
|
||||||
mImageContainer.swap(srcImage);
|
mImageContainer.swap(srcImage);
|
||||||
@ -4465,8 +4467,7 @@ nsImageRenderer::IsRasterImage()
|
|||||||
if (mType != eStyleImageType_Image)
|
if (mType != eStyleImageType_Image)
|
||||||
return false;
|
return false;
|
||||||
nsCOMPtr<imgIContainer> img;
|
nsCOMPtr<imgIContainer> img;
|
||||||
nsresult rv = mImage->GetImageData()->GetImage(getter_AddRefs(img));
|
if (NS_FAILED(mImage->GetImageData()->GetImage(getter_AddRefs(img))))
|
||||||
if (NS_FAILED(rv) || !img)
|
|
||||||
return false;
|
return false;
|
||||||
return img->GetType() == imgIContainer::TYPE_RASTER;
|
return img->GetType() == imgIContainer::TYPE_RASTER;
|
||||||
}
|
}
|
||||||
@ -4478,7 +4479,7 @@ nsImageRenderer::GetContainer()
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
nsCOMPtr<imgIContainer> img;
|
nsCOMPtr<imgIContainer> img;
|
||||||
nsresult rv = mImage->GetImageData()->GetImage(getter_AddRefs(img));
|
nsresult rv = mImage->GetImageData()->GetImage(getter_AddRefs(img));
|
||||||
if (NS_FAILED(rv) || !img)
|
if (NS_FAILED(rv))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
nsRefPtr<ImageContainer> container;
|
nsRefPtr<ImageContainer> container;
|
||||||
rv = img->GetImageContainer(getter_AddRefs(container));
|
rv = img->GetImageContainer(getter_AddRefs(container));
|
||||||
|
@ -4291,12 +4291,12 @@ nsLayoutUtils::SurfaceFromElement(nsIImageLoadingContent* aElement,
|
|||||||
|
|
||||||
nsCOMPtr<nsIPrincipal> principal;
|
nsCOMPtr<nsIPrincipal> principal;
|
||||||
rv = imgRequest->GetImagePrincipal(getter_AddRefs(principal));
|
rv = imgRequest->GetImagePrincipal(getter_AddRefs(principal));
|
||||||
if (NS_FAILED(rv) || !principal)
|
if (NS_FAILED(rv))
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
nsCOMPtr<imgIContainer> imgContainer;
|
nsCOMPtr<imgIContainer> imgContainer;
|
||||||
rv = imgRequest->GetImage(getter_AddRefs(imgContainer));
|
rv = imgRequest->GetImage(getter_AddRefs(imgContainer));
|
||||||
if (NS_FAILED(rv) || !imgContainer)
|
if (NS_FAILED(rv))
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
uint32_t whichFrame = (aSurfaceFlags & SFE_WANT_FIRST_FRAME)
|
uint32_t whichFrame = (aSurfaceFlags & SFE_WANT_FIRST_FRAME)
|
||||||
@ -4786,9 +4786,7 @@ nsLayoutUtils::RegisterImageRequestIfAnimated(nsPresContext* aPresContext,
|
|||||||
|
|
||||||
if (aRequest) {
|
if (aRequest) {
|
||||||
nsCOMPtr<imgIContainer> image;
|
nsCOMPtr<imgIContainer> image;
|
||||||
aRequest->GetImage(getter_AddRefs(image));
|
if (NS_SUCCEEDED(aRequest->GetImage(getter_AddRefs(image)))) {
|
||||||
if (image) {
|
|
||||||
|
|
||||||
// Check to verify that the image is animated. If so, then add it to the
|
// Check to verify that the image is animated. If so, then add it to the
|
||||||
// list of images tracked by the refresh driver.
|
// list of images tracked by the refresh driver.
|
||||||
bool isAnimated = false;
|
bool isAnimated = false;
|
||||||
@ -4825,8 +4823,7 @@ nsLayoutUtils::DeregisterImageRequest(nsPresContext* aPresContext,
|
|||||||
|
|
||||||
if (aRequest) {
|
if (aRequest) {
|
||||||
nsCOMPtr<imgIContainer> image;
|
nsCOMPtr<imgIContainer> image;
|
||||||
aRequest->GetImage(getter_AddRefs(image));
|
if (NS_SUCCEEDED(aRequest->GetImage(getter_AddRefs(image)))) {
|
||||||
if (image) {
|
|
||||||
aPresContext->RefreshDriver()->RemoveImageRequest(aRequest);
|
aPresContext->RefreshDriver()->RemoveImageRequest(aRequest);
|
||||||
|
|
||||||
if (aRequestRegistered) {
|
if (aRequestRegistered) {
|
||||||
|
@ -464,8 +464,7 @@ nsRefreshDriver::ImageRequestEnumerator(nsISupportsHashKey* aEntry,
|
|||||||
imgIRequest* req = static_cast<imgIRequest*>(aEntry->GetKey());
|
imgIRequest* req = static_cast<imgIRequest*>(aEntry->GetKey());
|
||||||
NS_ABORT_IF_FALSE(req, "Unable to retrieve the image request");
|
NS_ABORT_IF_FALSE(req, "Unable to retrieve the image request");
|
||||||
nsCOMPtr<imgIContainer> image;
|
nsCOMPtr<imgIContainer> image;
|
||||||
req->GetImage(getter_AddRefs(image));
|
if (NS_SUCCEEDED(req->GetImage(getter_AddRefs(image)))) {
|
||||||
if (image) {
|
|
||||||
image->RequestRefresh(mostRecentRefresh);
|
image->RequestRefresh(mostRecentRefresh);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user