1604395 - Dead assignment in ContentEventHandler::AppendFontRanges

Status: RESOLVED FIXED

(Core :: DOM: Events, defect)

Description

[Alex Henrie]

ContentEventHandler::AppendFontRanges currently looks like this:

if (startXPOffset > lastXPEndOffset) {
  // Create range for skipped leading chars.
  AppendFontRange(aFontRanges, baseOffset);
  baseOffset += GetTextLengthInRange(aContent, lastXPEndOffset,
                                     startXPOffset, aLineBreakType);
  lastXPEndOffset = startXPOffset;
}

FontRange* fontRange = AppendFontRange(aFontRanges, baseOffset);
fontRange->mFontName.Append(NS_ConvertUTF8toUTF16(font->GetName()));
fontRange->mFontSize = font->GetAdjustedSize();

// The converted original offset may exceed the range,
// hence we need to clamp it.
uint32_t endXPOffset =
    iter.ConvertSkippedToOriginal(runIter.GetStringEnd());
endXPOffset = std::min(frameXPEnd, endXPOffset);
baseOffset += GetTextLengthInRange(aContent, startXPOffset, endXPOffset,
                                   aLineBreakType);

There is no reason to set lastXPEndOffset to startXPOffset because it is overwritten again before it is used. This assignment has been a dead assignment ever since it was added in January 2015 as part of the fix for Bug 569334.

Comment 1

[Alex Henrie]

Attachment: Bug 1604395 - Remove dead assignment from ContentEventHandler::AppendFontRanges.

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/78b4443ee620
Remove dead assignment from ContentEventHandler::AppendFontRanges. r=masayuki

Comment 3

[Andrei Ciure[:aciure]]

https://hg.mozilla.org/mozilla-central/rev/78b4443ee620