wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 870021 - Part 5.2 - Ask content to compute its intrinsic size in nsImageFrame. r=roc

Browse Source
This commit is contained in:
John Schoenick 2014-05-23 16:05:42 -07:00
parent 89ad23c2f0
commit 2b1f9633ee
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/generic/nsImageFrame.cpp
View File

@ -734,9 +734,29 @@ nsImageFrame::ComputeSize(nsRenderingContext *aRenderingContext,
nsPresContext *presContext = PresContext();
EnsureIntrinsicSizeAndRatio(presContext);
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
NS_ASSERTION(imageLoader, "No content node??");
mozilla::IntrinsicSize intrinsicSize(mIntrinsicSize);
if (intrinsicSize.width.GetUnit() == eStyleUnit_Coord) {
uint32_t width;
if (NS_SUCCEEDED(imageLoader->GetNaturalWidth(&width))) {
nscoord appWidth = nsPresContext::CSSPixelsToAppUnits((int32_t)width);
intrinsicSize.width.SetCoordValue(appWidth);
}
}
if (intrinsicSize.height.GetUnit() == eStyleUnit_Coord) {
uint32_t height;
if (NS_SUCCEEDED(imageLoader->GetNaturalHeight(&height))) {
nscoord appHeight = nsPresContext::CSSPixelsToAppUnits((int32_t)height);
intrinsicSize.height.SetCoordValue(appHeight);
}
}
return nsLayoutUtils::ComputeSizeWithIntrinsicDimensions(
aRenderingContext, this,
mIntrinsicSize, mIntrinsicRatio, aCBSize,
intrinsicSize, mIntrinsicRatio, aCBSize,
aMargin, aBorder, aPadding);
}