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

In GetPrevNextBidiLevels, treat the "before <br>" case as if we were end-of-line. bug=330461 r=smontagu sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@207306 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
uriber%gmail.com
2006-08-14 11:25:57 +00:00
parent 8749103b3d
commit c4edf79a42
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/layout/generic/nsSelection.cpp
View File

@@ -1988,20 +1988,27 @@ nsFrameSelection::GetPrevNextBidiLevels(nsIContent *aNode,
if (NS_SUCCEEDED(rv))
newFrame = pos.mResultFrame;
if (direction == eDirNext) {
levels.SetData(currentFrame, newFrame,
NS_GET_EMBEDDING_LEVEL(currentFrame),
newFrame ? NS_GET_EMBEDDING_LEVEL(newFrame) :
NS_GET_BASE_LEVEL(currentFrame));
return levels;
}
else {
levels.SetData(newFrame, currentFrame,
newFrame ? NS_GET_EMBEDDING_LEVEL(newFrame) :
NS_GET_BASE_LEVEL(currentFrame),
NS_GET_EMBEDDING_LEVEL(currentFrame));
return levels;
PRUint8 baseLevel = NS_GET_BASE_LEVEL(currentFrame);
PRUint8 currentLevel = NS_GET_EMBEDDING_LEVEL(currentFrame);
PRUint8 newLevel = newFrame ? NS_GET_EMBEDDING_LEVEL(newFrame) : baseLevel;
// If not jumping lines, disregard br frames, since they might be positioned incorrectly.
// XXX This could be removed once bug 339786 is fixed.
if (!aJumpLines) {
if (currentFrame->GetType() == nsLayoutAtoms::brFrame) {
currentFrame = nsnull;
currentLevel = baseLevel;
}
if (newFrame && newFrame->GetType() == nsLayoutAtoms::brFrame) {
newFrame = nsnull;
newLevel = baseLevel;
}
}
if (direction == eDirNext)
levels.SetData(currentFrame, newFrame, currentLevel, newLevel);
else
levels.SetData(newFrame, currentFrame, newLevel, currentLevel);
return levels;
}