зеркало из https://github.com/mozilla/gecko-dev.git
Bug 801116 followup: clearer variable naming. DONTBUILD
This commit is contained in:
Родитель
f6f9bc8fd4
Коммит
79c420f15b
|
@ -2592,19 +2592,19 @@ nsLayoutUtils::IntrinsicForContainer(nsRenderingContext *aRenderingContext,
|
||||||
if (GetAbsoluteCoord(styleMaxHeight, h) ||
|
if (GetAbsoluteCoord(styleMaxHeight, h) ||
|
||||||
GetPercentHeight(styleMaxHeight, aFrame, h)) {
|
GetPercentHeight(styleMaxHeight, aFrame, h)) {
|
||||||
h = NS_MAX(0, h - heightTakenByBoxSizing);
|
h = NS_MAX(0, h - heightTakenByBoxSizing);
|
||||||
nscoord maxHeight =
|
nscoord maxWidth =
|
||||||
NSToCoordRound(h * (float(ratio.width) / float(ratio.height)));
|
NSToCoordRound(h * (float(ratio.width) / float(ratio.height)));
|
||||||
if (maxHeight < result)
|
if (maxWidth < result)
|
||||||
result = maxHeight;
|
result = maxWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetAbsoluteCoord(styleMinHeight, h) ||
|
if (GetAbsoluteCoord(styleMinHeight, h) ||
|
||||||
GetPercentHeight(styleMinHeight, aFrame, h)) {
|
GetPercentHeight(styleMinHeight, aFrame, h)) {
|
||||||
h = NS_MAX(0, h - heightTakenByBoxSizing);
|
h = NS_MAX(0, h - heightTakenByBoxSizing);
|
||||||
nscoord minHeight =
|
nscoord minWidth =
|
||||||
NSToCoordRound(h * (float(ratio.width) / float(ratio.height)));
|
NSToCoordRound(h * (float(ratio.width) / float(ratio.height)));
|
||||||
if (minHeight > result)
|
if (minWidth > result)
|
||||||
result = minHeight;
|
result = minWidth;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче