Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

195080 fix regression. sr=sfrasier r=danm. fix logic for moving caret around 0 width frames

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@141980 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mjudge%netscape.com
2003-04-30 21:37:05 +00:00
parent 2e60140224
commit 51c60875af
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/generic/nsLineBox.cpp
View File

@@ -893,8 +893,6 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
else
#endif // IBMBIDI
frame->GetNextSibling(&nextFrame);
if (nextFrame == stoppingFrame)
break;
frame->GetRect(r1);
if (r1.width && aX > r1.x) {
break;
@@ -914,6 +912,8 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
*aXIsBeforeFirstFrame = PR_TRUE;
}
frame = nextFrame;
if (nextFrame == stoppingFrame)
break;
}
}
else {
@@ -950,8 +950,6 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
else
#endif // IBMBIDI
frame->GetNextSibling(&nextFrame);
if (nextFrame == stoppingFrame)
break;
frame->GetRect(r1);
if (r1.width && aX < r1.XMost()) {
break;
@@ -971,6 +969,8 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
*aXIsAfterLastFrame = PR_TRUE;
}
frame = nextFrame;
if (nextFrame == stoppingFrame)
break;
}
}

8
mozilla/layout/html/base/src/nsLineBox.cpp
View File

@@ -893,8 +893,6 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
else
#endif // IBMBIDI
frame->GetNextSibling(&nextFrame);
if (nextFrame == stoppingFrame)
break;
frame->GetRect(r1);
if (r1.width && aX > r1.x) {
break;
@@ -914,6 +912,8 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
*aXIsBeforeFirstFrame = PR_TRUE;
}
frame = nextFrame;
if (nextFrame == stoppingFrame)
break;
}
}
else {
@@ -950,8 +950,6 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
else
#endif // IBMBIDI
frame->GetNextSibling(&nextFrame);
if (nextFrame == stoppingFrame)
break;
frame->GetRect(r1);
if (r1.width && aX < r1.XMost()) {
break;
@@ -971,6 +969,8 @@ nsLineIterator::FindFrameAt(PRInt32 aLineNumber,
*aXIsAfterLastFrame = PR_TRUE;
}
frame = nextFrame;
if (nextFrame == stoppingFrame)
break;
}
}