Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a problem where the caret could be using a stale offset, after a node

Browse Source
This commit is contained in:
sfraser%netscape.com 1999-04-13 01:13:00 +00:00
parent c67fa96f11
commit fd2a70df78
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/base/nsCaret.cpp
View File

@ -281,7 +281,20 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
{
if (!mDrawn)
{
return (mLastCaretFrame != nsnull); // if we are going to erase, we just need to have the old frame
if (!mLastCaretFrame) return PR_FALSE;
// check there that our cached offset into the frame content
// is still valid. It can go bad when splitting nodes
PRInt32 contentStart, contentEnd;
mLastCaretFrame->GetOffsets(contentStart, contentEnd);
if (mLastContentOffset < contentStart)
mLastContentOffset = contentStart;
if (mLastContentOffset > contentEnd)
mLastContentOffset = contentEnd;
return PR_TRUE;
}
nsCOMPtr<nsIDOMSelection> domSelection;
@ -291,7 +304,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
PRBool isCollapsed;
if (domSelection && NS_SUCCEEDED(domSelection->IsCollapsed(&isCollapsed)) && isCollapsed)
if (domSelection && NS_SUCCEEDED(domSelection->GetIsCollapsed(&isCollapsed)) && isCollapsed)
{
// start and end parent should be the same since we are collapsed
nsCOMPtr<nsIDOMNode> focusNode;

17
layout/base/src/nsCaret.cpp
View File

@ -281,7 +281,20 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
{
if (!mDrawn)
{
return (mLastCaretFrame != nsnull); // if we are going to erase, we just need to have the old frame
if (!mLastCaretFrame) return PR_FALSE;
// check there that our cached offset into the frame content
// is still valid. It can go bad when splitting nodes
PRInt32 contentStart, contentEnd;
mLastCaretFrame->GetOffsets(contentStart, contentEnd);
if (mLastContentOffset < contentStart)
mLastContentOffset = contentStart;
if (mLastContentOffset > contentEnd)
mLastContentOffset = contentEnd;
return PR_TRUE;
}
nsCOMPtr<nsIDOMSelection> domSelection;
@ -291,7 +304,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
PRBool isCollapsed;
if (domSelection && NS_SUCCEEDED(domSelection->IsCollapsed(&isCollapsed)) && isCollapsed)
if (domSelection && NS_SUCCEEDED(domSelection->GetIsCollapsed(&isCollapsed)) && isCollapsed)
{
// start and end parent should be the same since we are collapsed
nsCOMPtr<nsIDOMNode> focusNode;