Bug 1965106. Fix ClippedImage and DynamicImage GetIntrinsicSizeInAppUnits to actually be in app units. r=dholbert

Differential Revision: https://phabricator.services.mozilla.com/D249234

image/ClippedImage.cpp

@@ -18,6 +18,7 @@
 #include "gfxUtils.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SVGImageContext.h"
+#include "nsPresContext.h"
 
 #include "mozilla/gfx/2D.h"
 
@@ -212,8 +213,8 @@ ClippedImage::GetIntrinsicSizeInAppUnits(nsSize* aSize) {
     return InnerImage()->GetIntrinsicSizeInAppUnits(aSize);
   }
 
-  // XXXdholbert This probably needs to be scaled; see bug 1965106.
-  *aSize = nsSize(mClip.Width(), mClip.Height());
+  *aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(mClip.Width()),
+                  nsPresContext::CSSPixelsToAppUnits(mClip.Height()));
   return NS_OK;
 }
 

image/DynamicImage.cpp

@@ -14,6 +14,7 @@
 #include "ImageRegion.h"
 #include "Orientation.h"
 #include "mozilla/image/Resolution.h"
+#include "nsPresContext.h"
 
 #include "mozilla/MemoryReporting.h"
 
@@ -108,9 +109,10 @@ DynamicImage::GetIntrinsicSize(ImageIntrinsicSize* aIntrinsicSize) {
 
 NS_IMETHODIMP
 DynamicImage::GetIntrinsicSizeInAppUnits(nsSize* aSize) {
-  // XXXdholbert This probably needs to be scaled; see bug 1965106.
   IntSize intSize(mDrawable->Size());
-  *aSize = nsSize(intSize.width, intSize.height);
+
+  *aSize = nsSize(nsPresContext::CSSPixelsToAppUnits(intSize.width),
+                  nsPresContext::CSSPixelsToAppUnits(intSize.height));
   return NS_OK;
 }