Bug 1251995 followup - Fix declaration shadow error.

This commit is contained in:
Xidorn Quan 2016-03-07 17:29:41 +08:00
Родитель fb0552261b
Коммит d0d9fe2a65
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -974,12 +974,12 @@ gfxTextRun::BreakAndMeasureText(uint32_t aStart, uint32_t aMaxLength,
}
if (aMetrics) {
auto end = aStart + charsFit;
*aMetrics = MeasureText(Range(aStart, end), aBoundingBoxType,
auto fitEnd = aStart + charsFit;
*aMetrics = MeasureText(Range(aStart, fitEnd), aBoundingBoxType,
aRefDrawTarget, aProvider);
if (trimmableChars) {
Metrics trimMetrics =
MeasureText(Range(end - trimmableChars, end),
MeasureText(Range(fitEnd - trimmableChars, fitEnd),
aBoundingBoxType, aRefDrawTarget, aProvider);
aMetrics->mAdvanceWidth -= trimMetrics.mAdvanceWidth;
}