Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1439524 - Clamp glyph-run offsets appropriately for the current frame's content to avoid potential failure to create the Range. r=dholbert

Browse Source
This commit is contained in:
Jonathan Kew 2018-02-20 20:46:51 +00:00
parent 91522ab384
commit 84f4d3dc1d
2 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
layout/base/nsLayoutUtils.cpp
View File

@ -8096,39 +8096,63 @@ nsLayoutUtils::GetFontFacesForFrames(nsIFrame* aFrame,
static void
AddFontsFromTextRun(gfxTextRun* aTextRun,
nsIContent* aContent,
nsTextFrame* aFrame,
gfxSkipCharsIterator& aSkipIter,
uint32_t aOffset,
uint32_t aLength,
const gfxTextRun::Range& aRange,
nsLayoutUtils::UsedFontFaceTable& aFontFaces,
uint32_t aMaxRanges)
{
gfxTextRun::Range range(aOffset, aOffset + aLength);
gfxTextRun::GlyphRunIterator iter(aTextRun, range);
while (iter.NextRun()) {
gfxFontEntry *fe = iter.GetGlyphRun()->mFont->GetFontEntry();
gfxTextRun::GlyphRunIterator glyphRuns(aTextRun, aRange);
nsIContent* content = aFrame->GetContent();
int32_t contentLimit = aFrame->GetContentOffset() +
aFrame->GetInFlowContentLength();
while (glyphRuns.NextRun()) {
gfxFontEntry *fe = glyphRuns.GetGlyphRun()->mFont->GetFontEntry();
// if we have already listed this face, just make sure the match type is
// recorded
InspectorFontFace* fontFace = aFontFaces.Get(fe);
if (fontFace) {
fontFace->AddMatchType(iter.GetGlyphRun()->mMatchType);
fontFace->AddMatchType(glyphRuns.GetGlyphRun()->mMatchType);
} else {
// A new font entry we haven't seen before
fontFace = new InspectorFontFace(fe, aTextRun->GetFontGroup(),
iter.GetGlyphRun()->mMatchType);
glyphRuns.GetGlyphRun()->mMatchType);
aFontFaces.Put(fe, fontFace);
}
// Add this glyph run to the fontFace's list of ranges, unless we have
// already collected as many as wanted.
if (fontFace->RangeCount() < aMaxRanges) {
uint32_t start = aSkipIter.ConvertSkippedToOriginal(iter.GetStringStart());
uint32_t end = aSkipIter.ConvertSkippedToOriginal(iter.GetStringEnd());
RefPtr<nsRange> range;
nsRange::CreateRange(aContent, start, aContent, end, getter_AddRefs(range));
fontFace->AddRange(range);
int32_t start =
aSkipIter.ConvertSkippedToOriginal(glyphRuns.GetStringStart());
int32_t end =
aSkipIter.ConvertSkippedToOriginal(glyphRuns.GetStringEnd());
// Mapping back from textrun offsets ("skipped" offsets that reflect the
// text after whitespace collapsing, etc) to DOM content offsets in the
// original text is ambiguous, because many original characters can
// map to a single skipped offset. aSkipIter.ConvertSkippedToOriginal()
// will return an "original" offset that corresponds to the *end* of
// a collapsed run of characters in this case; but that might extend
// beyond the current content node if the textrun mapped multiple nodes.
// So we clamp the end offset to keep it valid for the content node
// that corresponds to the current textframe.
end = std::min(end, contentLimit);
if (end > start) {
RefPtr<nsRange> range;
if (NS_FAILED(nsRange::CreateRange(content, start, content, end,
getter_AddRefs(range)))) {
NS_WARNING("failed to create range");
} else {
fontFace->AddRange(range);
}
}
}
}
}
/* static */ nsresult
/* static */ void
nsLayoutUtils::GetFontFacesForText(nsIFrame* aFrame,
int32_t aStartOffset,
int32_t aEndOffset,
@ -8139,7 +8163,7 @@ nsLayoutUtils::GetFontFacesForText(nsIFrame* aFrame,
NS_PRECONDITION(aFrame, "NULL frame pointer");
if (!aFrame->IsTextFrame()) {
return NS_OK;
return;
}
nsTextFrame* curr = static_cast<nsTextFrame*>(aFrame);
@ -8154,7 +8178,10 @@ nsLayoutUtils::GetFontFacesForText(nsIFrame* aFrame,
// curr is overlapping with the offset we want
gfxSkipCharsIterator iter = curr->EnsureTextRun(nsTextFrame::eInflated);
gfxTextRun* textRun = curr->GetTextRun(nsTextFrame::eInflated);
NS_ENSURE_TRUE(textRun, NS_ERROR_OUT_OF_MEMORY);
if (!textRun) {
NS_WARNING("failed to get textRun, low memory?");
return;
}
// include continuations in the range that share the same textrun
nsTextFrame* next = nullptr;
@ -8167,14 +8194,12 @@ nsLayoutUtils::GetFontFacesForText(nsIFrame* aFrame,
}
}
uint32_t skipStart = iter.ConvertOriginalToSkipped(fstart);
uint32_t skipEnd = iter.ConvertOriginalToSkipped(fend);
AddFontsFromTextRun(textRun, aFrame->GetContent(), iter,
skipStart, skipEnd - skipStart, aFontFaces, aMaxRanges);
gfxTextRun::Range range(iter.ConvertOriginalToSkipped(fstart),
iter.ConvertOriginalToSkipped(fend));
AddFontsFromTextRun(textRun, curr, iter, range, aFontFaces, aMaxRanges);
curr = next;
} while (aFollowContinuations && curr);
return NS_OK;
}
/* static */

12
layout/base/nsLayoutUtils.h
View File

@ -2294,12 +2294,12 @@ public:
* entire text is to be considered.
* aMaxRanges: maximum number of text ranges to record for each face.
*/
static nsresult GetFontFacesForText(nsIFrame* aFrame,
int32_t aStartOffset,
int32_t aEndOffset,
bool aFollowContinuations,
UsedFontFaceTable& aResult,
uint32_t aMaxRanges);
static void GetFontFacesForText(nsIFrame* aFrame,
int32_t aStartOffset,
int32_t aEndOffset,
bool aFollowContinuations,
UsedFontFaceTable& aResult,
uint32_t aMaxRanges);
/**
* Walks the frame tree starting at aFrame looking for textRuns.