Revert "Bug 1965106. Fix ClippedImage and DynamicImage GetIntrinsicSizeInAppUnits to actually be in app units. r=dholbert" for causing build bustages @ ClippedImage.cpp
This reverts commit db08ac1033.
This commit is contained in:
committed by
smolnar@mozilla.com
parent
22471e8da5
commit
7cd700e4f7
@@ -212,8 +212,8 @@ ClippedImage::GetIntrinsicSizeInAppUnits(nsSize* aSize) {
|
|||||||
return InnerImage()->GetIntrinsicSizeInAppUnits(aSize);
|
return InnerImage()->GetIntrinsicSizeInAppUnits(aSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
*aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(mClip.Width()),
|
// XXXdholbert This probably needs to be scaled; see bug 1965106.
|
||||||
nsPresContext::CSSPixelsToAppUnits(mClip.Height()));
|
*aSize = nsSize(mClip.Width(), mClip.Height());
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -108,10 +108,9 @@ DynamicImage::GetIntrinsicSize(ImageIntrinsicSize* aIntrinsicSize) {
|
|||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
DynamicImage::GetIntrinsicSizeInAppUnits(nsSize* aSize) {
|
DynamicImage::GetIntrinsicSizeInAppUnits(nsSize* aSize) {
|
||||||
|
// XXXdholbert This probably needs to be scaled; see bug 1965106.
|
||||||
IntSize intSize(mDrawable->Size());
|
IntSize intSize(mDrawable->Size());
|
||||||
|
*aSize = nsSize(intSize.width, intSize.height);
|
||||||
*aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(intSize.width),
|
|
||||||
nsPresContext::CSSPixelsToAppUnits(intSize.height));
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user