Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 17:23:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1166436 part.18 ContentCache should guess caret rect if there is a text rect cache of the previous character r=m_kato

Browse Source
This commit is contained in:
Masayuki Nakano 2015-06-05 18:28:21 +09:00
parent 649a872a61
commit fefa36dd36
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widget/ContentCache.cpp
View File

@ -685,7 +685,7 @@ ContentCache::GetTextRect(uint32_t aOffset,
return !aTextRect.IsEmpty();
}
if (NS_WARN_IF(!mTextRectArray.InRange(aOffset))) {
if (!mTextRectArray.InRange(aOffset)) {
aTextRect.SetEmpty();
return false;
}
@ -719,7 +719,7 @@ ContentCache::GetUnionTextRects(uint32_t aOffset,
}
}
if (NS_WARN_IF(!mTextRectArray.InRange(aOffset, aLength))) {
if (!mTextRectArray.InRange(aOffset, aLength)) {
aUnionTextRect.SetEmpty();
return false;
}
@ -751,8 +751,19 @@ ContentCache::GetCaretRect(uint32_t aOffset,
// Guess caret rect from the text rect if it's stored.
if (!GetTextRect(aOffset, aCaretRect)) {
aCaretRect.SetEmpty();
return false;
// There might be previous character rect in the cache. If so, we can
// guess the caret rect with it.
if (!aOffset || !GetTextRect(aOffset - 1, aCaretRect)) {
aCaretRect.SetEmpty();
return false;
}
if (mSelection.mWritingMode.IsVertical()) {
aCaretRect.y = aCaretRect.YMost();
} else {
// XXX bidi-unaware.
aCaretRect.x = aCaretRect.XMost();
}
}
// XXX This is not bidi aware because we don't cache each character's