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

Fixed retaining text attributes when using 'end' key. b=113613, fix=mjudge, r=blythe, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@123788 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com 2002-06-21 14:22:30 +00:00
parent 98ff642747
commit fde673846b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/generic/nsFrame.cpp
View File

@ -3371,7 +3371,8 @@ DrillDownToEndOfLine(nsIFrame* aFrame, PRInt32 aLineNo, PRInt32 aLineFrameCount,
return NS_ERROR_UNEXPECTED;
nsresult rv = NS_ERROR_FAILURE;
PRBool found = PR_FALSE;
while (!found) // I have no idea why this loop exists. Mike?
nsCOMPtr<nsIAtom> frameType;
while (!found) // this loop searches for a valid point to leave the peek offset struct.
{
nsIFrame *nextFrame = aFrame;
nsIFrame *currentFrame = aFrame;
@ -3389,7 +3390,12 @@ DrillDownToEndOfLine(nsIFrame* aFrame, PRInt32 aLineNo, PRInt32 aLineFrameCount,
nextFrame = currentFrame; //back it up. lets show a warning
NS_WARNING("lineFrame Count lied to us from nsILineIterator!\n");
}
nextFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::brFrame == frameType.get())
{
nextFrame = currentFrame;
}
nsPoint offsetPoint; //used for offset of result frame
nsIView * view; //used for call of get offset from view
nextFrame->GetOffsetFromView(aPresContext, offsetPoint, &view);

10
mozilla/layout/html/base/src/nsFrame.cpp
View File

@ -3371,7 +3371,8 @@ DrillDownToEndOfLine(nsIFrame* aFrame, PRInt32 aLineNo, PRInt32 aLineFrameCount,
return NS_ERROR_UNEXPECTED;
nsresult rv = NS_ERROR_FAILURE;
PRBool found = PR_FALSE;
while (!found) // I have no idea why this loop exists. Mike?
nsCOMPtr<nsIAtom> frameType;
while (!found) // this loop searches for a valid point to leave the peek offset struct.
{
nsIFrame *nextFrame = aFrame;
nsIFrame *currentFrame = aFrame;
@ -3389,7 +3390,12 @@ DrillDownToEndOfLine(nsIFrame* aFrame, PRInt32 aLineNo, PRInt32 aLineFrameCount,
nextFrame = currentFrame; //back it up. lets show a warning
NS_WARNING("lineFrame Count lied to us from nsILineIterator!\n");
}
nextFrame->GetFrameType(getter_AddRefs(frameType));
if (nsLayoutAtoms::brFrame == frameType.get())
{
nextFrame = currentFrame;
}
nsPoint offsetPoint; //used for offset of result frame
nsIView * view; //used for call of get offset from view
nextFrame->GetOffsetFromView(aPresContext, offsetPoint, &view);