diff options
author | Andy <webmaster@RealityRipple.com> | 2020-08-04 13:54:01 -0700 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-08-30 09:23:18 +0000 |
commit | 0bbe6ec10589b8540aa86200bf2b209ad4e563ba (patch) | |
tree | 2144747a67a4be26df207060bd9e32e8e2f7f39a /layout/generic/nsImageFrame.h | |
parent | 48d31ea5ebe2a4901fcb542e1e48b6fd6b67d64c (diff) | |
download | UXP-0bbe6ec10589b8540aa86200bf2b209ad4e563ba.tar UXP-0bbe6ec10589b8540aa86200bf2b209ad4e563ba.tar.gz UXP-0bbe6ec10589b8540aa86200bf2b209ad4e563ba.tar.lz UXP-0bbe6ec10589b8540aa86200bf2b209ad4e563ba.tar.xz UXP-0bbe6ec10589b8540aa86200bf2b209ad4e563ba.zip |
Issue #1620 - Use Intrinsic Aspect Ratio for Images (uplift)
Diffstat (limited to 'layout/generic/nsImageFrame.h')
-rw-r--r-- | layout/generic/nsImageFrame.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h index 2414d89df..5e9b67274 100644 --- a/layout/generic/nsImageFrame.h +++ b/layout/generic/nsImageFrame.h @@ -273,21 +273,19 @@ private: void GetDocumentCharacterSet(nsACString& aCharset) const; bool ShouldDisplaySelection(); + // Whether the image frame should use the mapped aspect ratio from width="" + // and height="". + bool ShouldUseMappedAspectRatio() const; + /** * Recalculate mIntrinsicSize from the image. - * - * @return whether aImage's size did _not_ - * match our previous intrinsic size. */ - bool UpdateIntrinsicSize(imgIContainer* aImage); + bool UpdateIntrinsicSize(); /** * Recalculate mIntrinsicRatio from the image. - * - * @return whether aImage's ratio did _not_ - * match our previous intrinsic ratio. */ - bool UpdateIntrinsicRatio(imgIContainer* aImage); + bool UpdateIntrinsicRatio(); /** * This function calculates the transform for converting between @@ -308,6 +306,12 @@ private: bool IsPendingLoad(imgIRequest* aRequest) const; /** + * Updates mImage based on the current image request (cannot be null), and the + * image passed in (can be null), and invalidate layout and paint as needed. + */ + void UpdateImage(imgIRequest* aRequest, imgIContainer* aImage); + + /** * Function to convert a dirty rect in the source image to a dirty * rect for the image frame. */ |