From 51c60875af33e1bbd07af353a2ab09dee2cac4ab Mon Sep 17 00:00:00 2001 From: "mjudge%netscape.com" Date: Wed, 30 Apr 2003 21:37:05 +0000 Subject: [PATCH] 195080 fix regression. sr=sfrasier r=danm. fix logic for moving caret around 0 width frames git-svn-id: svn://10.0.0.236/trunk@141980 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineBox.cpp | 8 ++++---- mozilla/layout/html/base/src/nsLineBox.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp index 65c590b7f14..b891e8f7c3f 100644 --- a/mozilla/layout/generic/nsLineBox.cpp +++ b/mozilla/layout/generic/nsLineBox.cpp @@ -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; } } diff --git a/mozilla/layout/html/base/src/nsLineBox.cpp b/mozilla/layout/html/base/src/nsLineBox.cpp index 65c590b7f14..b891e8f7c3f 100644 --- a/mozilla/layout/html/base/src/nsLineBox.cpp +++ b/mozilla/layout/html/base/src/nsLineBox.cpp @@ -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; } }