зеркало из https://github.com/mozilla/gecko-dev.git
bug 1096132 rename UpdateScaledAppUnits() to UpdateAppUnitsForFullZoom() r=tn
--HG-- extra : rebase_source : ec70af284ea91d28e6f66b487c7a543a1d93c7cc
This commit is contained in:
Родитель
4b187d31fa
Коммит
2f7cdcc695
|
@ -365,7 +365,7 @@ nsDeviceContext::SetDPI()
|
|||
NS_ASSERTION(dpi != -1.0, "no dpi set");
|
||||
|
||||
mAppUnitsPerPhysicalInch = NS_lround(dpi * mAppUnitsPerDevPixelAtUnitFullZoom);
|
||||
UpdateScaledAppUnits();
|
||||
UpdateAppUnitsForFullZoom();
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
@ -740,12 +740,12 @@ nsDeviceContext::SetPixelScale(float aScale)
|
|||
}
|
||||
int32_t oldAppUnitsPerDevPixel = mAppUnitsPerDevPixel;
|
||||
mPixelScale = aScale;
|
||||
UpdateScaledAppUnits();
|
||||
UpdateAppUnitsForFullZoom();
|
||||
return oldAppUnitsPerDevPixel != mAppUnitsPerDevPixel;
|
||||
}
|
||||
|
||||
void
|
||||
nsDeviceContext::UpdateScaledAppUnits()
|
||||
nsDeviceContext::UpdateAppUnitsForFullZoom()
|
||||
{
|
||||
mAppUnitsPerDevPixel =
|
||||
std::max(1, NSToIntRound(float(mAppUnitsPerDevPixelAtUnitFullZoom) / mPixelScale));
|
||||
|
|
|
@ -259,7 +259,7 @@ private:
|
|||
void ComputeFullAreaUsingScreen(nsRect *outRect);
|
||||
void FindScreen(nsIScreen **outScreen);
|
||||
void CalcPrintingSize();
|
||||
void UpdateScaledAppUnits();
|
||||
void UpdateAppUnitsForFullZoom();
|
||||
|
||||
nscoord mWidth;
|
||||
nscoord mHeight;
|
||||
|
|
Загрузка…
Ссылка в новой задаче