Bug 1343695 Part 2: Narrow an overly restrictive assert in GetRenderedText. r=mats

MozReview-Commit-ID: EuxNJmKPxok

--HG--
extra : rebase_source : b77018ea2417b0778fb51ba579d8c4baeeaf06a5
This commit is contained in:
Brad Werth 2017-03-14 14:27:30 -07:00
Родитель d2ed12d9e6
Коммит 79fcb7ba0d
1 изменённых файлов: 7 добавлений и 1 удалений

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

@ -9838,7 +9838,13 @@ nsTextFrame::GetRenderedText(uint32_t aStartOffset,
TextOffsetType aOffsetType,
TrailingWhitespace aTrimTrailingWhitespace)
{
NS_ASSERTION(!GetPrevContinuation(), "Must be called on first-in-flow");
MOZ_ASSERT(aStartOffset <= aEndOffset, "bogus offsets");
MOZ_ASSERT(!GetPrevContinuation() ||
(aOffsetType == TextOffsetType::OFFSETS_IN_CONTENT_TEXT &&
aStartOffset >= (uint32_t)GetContentOffset() &&
aEndOffset <= (uint32_t)GetContentEnd()),
"Must be called on first-in-flow, or content offsets must be "
"given and be within this frame.");
// The handling of offsets could be more efficient...
RenderedText result;