Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1366984 - Fix image container check for background image layer. r=mattwoodrow

Browse Source 
--HG--
extra : source : 14a2665a64f6e78b7c470a3eb0635e491660955a
This commit is contained in:
Ethan Lin 2017-05-31 14:01:28 +08:00
parent 017d00381d
commit 054093eb1e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
layout/painting/nsCSSRendering.cpp
View File

@ -1969,23 +1969,32 @@ nsCSSRendering::CanBuildWebRenderDisplayItemsForStyleImageLayer(LayerManager* aM
}
}
// We only support painting gradients and image for a single style image layer
const nsStyleImage* styleImage = &aBackgroundStyle->mImage.mLayers[aLayer].mImage;
// We only support image with image container.
if (!styleImage->IsEmpty() && styleImage->GetType() == eStyleImageType_Image) {
imgRequestProxy* requestProxy = styleImage->GetImageData();
if (requestProxy) {
nsCOMPtr<imgIContainer> srcImage;
requestProxy->GetImage(getter_AddRefs(srcImage));
if (srcImage && !srcImage->IsImageContainerAvailable(aManager, imgIContainer::FLAG_NONE)) {
return false;
}
if (styleImage->GetType() == eStyleImageType_Image) {
if (styleImage->GetCropRect()) {
return false;
}
imgRequestProxy* requestProxy = styleImage->GetImageData();
if (!requestProxy) {
return false;
}
nsCOMPtr<imgIContainer> srcImage;
requestProxy->GetImage(getter_AddRefs(srcImage));
if (!srcImage || !srcImage->IsImageContainerAvailable(aManager, imgIContainer::FLAG_NONE)) {
return false;
}
return true;
}
// We only support painting gradients and image for a single style image layer
return styleImage->GetType() == eStyleImageType_Gradient ||
styleImage->GetType() == eStyleImageType_Image;
if (styleImage->GetType() == eStyleImageType_Gradient) {
return true;
}
return false;
}
DrawResult