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 1066805: Drop unused parameter from nsImageFrame::EnsureIntrinsicSizeAndRatio(). r=tn

Browse Source
This commit is contained in:
Daniel Holbert 2014-09-12 13:15:23 -07:00
parent 18eb0a7716
commit e386c5a0b1
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/generic/nsImageFrame.cpp
View File

@ -731,7 +731,7 @@ nsImageFrame::FrameChanged(imgIRequest *aRequest,
}
void
nsImageFrame::EnsureIntrinsicSizeAndRatio(nsPresContext* aPresContext)
nsImageFrame::EnsureIntrinsicSizeAndRatio()
{
// If mIntrinsicSize.width and height are 0, then we need to update from the
// image container.
@ -771,8 +771,7 @@ nsImageFrame::ComputeSize(nsRenderingContext *aRenderingContext,
const LogicalSize& aPadding,
uint32_t aFlags)
{
nsPresContext *presContext = PresContext();
EnsureIntrinsicSizeAndRatio(presContext);
EnsureIntrinsicSizeAndRatio();
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
NS_ASSERTION(imageLoader, "No content node??");
@ -849,8 +848,7 @@ nsImageFrame::GetMinISize(nsRenderingContext *aRenderingContext)
// min-height, and max-height properties.
DebugOnly<nscoord> result;
DISPLAY_MIN_WIDTH(this, result);
nsPresContext *presContext = PresContext();
EnsureIntrinsicSizeAndRatio(presContext);
EnsureIntrinsicSizeAndRatio();
return mIntrinsicSize.width.GetUnit() == eStyleUnit_Coord ?
mIntrinsicSize.width.GetCoordValue() : 0;
}
@ -862,8 +860,7 @@ nsImageFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
// min-height, and max-height properties.
DebugOnly<nscoord> result;
DISPLAY_PREF_WIDTH(this, result);
nsPresContext *presContext = PresContext();
EnsureIntrinsicSizeAndRatio(presContext);
EnsureIntrinsicSizeAndRatio();
// convert from normal twips to scaled twips (printing...)
return mIntrinsicSize.width.GetUnit() == eStyleUnit_Coord ?
mIntrinsicSize.width.GetCoordValue() : 0;

2
layout/generic/nsImageFrame.h
View File

@ -173,7 +173,7 @@ public:
protected:
virtual ~nsImageFrame();
void EnsureIntrinsicSizeAndRatio(nsPresContext* aPresContext);
void EnsureIntrinsicSizeAndRatio();
virtual mozilla::LogicalSize
ComputeSize(nsRenderingContext *aRenderingContext,