Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 08:13:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1602047 - Cleanup nsImageFrame::UpdateIntrinsic{Size,Ratio}. r=tnikkel

Browse Source 
We always pass mImage.

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-12-10 05:26:06 +00:00
parent d752f2fd64
commit 205021fe72
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/generic/nsImageFrame.cpp
View File

@ -305,11 +305,11 @@ void nsImageFrame::DidSetComputedStyle(ComputedStyle* aOldStyle) {
nsCOMPtr<imgIContainer> image(mImage->Unwrap());
mImage = nsLayoutUtils::OrientImage(image, newOrientation);
UpdateIntrinsicSize(mImage);
UpdateIntrinsicRatio(mImage);
UpdateIntrinsicSize();
UpdateIntrinsicRatio();
} else if (!aOldStyle || aOldStyle->StylePosition()->mAspectRatio !=
StylePosition()->mAspectRatio) {
UpdateIntrinsicRatio(mImage);
UpdateIntrinsicRatio();
}
}
@ -471,7 +471,7 @@ static IntrinsicSize ComputeIntrinsicSize(imgIContainer* aImage,
return IntrinsicSize(0, 0);
}
bool nsImageFrame::UpdateIntrinsicSize(imgIContainer* aImage) {
bool nsImageFrame::UpdateIntrinsicSize() {
IntrinsicSize oldIntrinsicSize = mIntrinsicSize;
mIntrinsicSize = ComputeIntrinsicSize(mImage, mKind, *this);
return mIntrinsicSize != oldIntrinsicSize;
@ -497,9 +497,9 @@ static AspectRatio ComputeAspectRatio(imgIContainer* aImage,
return AspectRatio();
}
bool nsImageFrame::UpdateIntrinsicRatio(imgIContainer* aImage) {
bool nsImageFrame::UpdateIntrinsicRatio() {
AspectRatio oldIntrinsicRatio = mIntrinsicRatio;
mIntrinsicRatio = ComputeAspectRatio(aImage, *this);
mIntrinsicRatio = ComputeAspectRatio(mImage, *this);
return mIntrinsicRatio != oldIntrinsicRatio;
}
@ -709,7 +709,7 @@ void nsImageFrame::UpdateImage(imgIRequest* aRequest, imgIContainer* aImage) {
// NOTE(emilio): Intentionally using `|` instead of `||` to avoid
// short-circuiting.
bool intrinsicSizeChanged =
UpdateIntrinsicSize(mImage) | UpdateIntrinsicRatio(mImage);
UpdateIntrinsicSize() | UpdateIntrinsicRatio();
if (!GotInitialReflow()) {
return;
}
@ -796,7 +796,7 @@ void nsImageFrame::ResponsiveContentDensityChanged() {
return;
}
if (!UpdateIntrinsicSize(mImage) && !UpdateIntrinsicRatio(mImage)) {
if (!UpdateIntrinsicSize() && !UpdateIntrinsicRatio()) {
return;
}
@ -891,8 +891,8 @@ void nsImageFrame::EnsureIntrinsicSizeAndRatio() {
return;
}
UpdateIntrinsicSize(mImage);
UpdateIntrinsicRatio(mImage);
UpdateIntrinsicSize();
UpdateIntrinsicRatio();
}
LogicalSize nsImageFrame::ComputeSize(

10
layout/generic/nsImageFrame.h
View File

@ -299,19 +299,13 @@ class nsImageFrame : public nsAtomicContainerFrame, public nsIReflowCallback {
/**
* 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