corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle returning nulls from CheckLineOrder correctly. bug=345616 r=smotagu sr=roc

Browse Source
This commit is contained in:
uriber@gmail.com
2006-08-04 05:40:57 +00:00
parent 01c527c000
commit d2643031f8
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
layout/generic/nsFrame.cpp
View File

@@ -4491,14 +4491,18 @@ nsFrame::GetFrameFromDirection(nsPresContext* aPresContext, nsPeekOffsetStruct *
PRBool isReordered;
result = it->CheckLineOrder(thisLine, &isReordered, &firstFrame, &lastFrame);
nsIFrame** framePtr = aPos->mDirection == eDirPrevious ? &firstFrame : &lastFrame;
nsBidiLevel embeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(*framePtr);
if (((embeddingLevel & 1) && lineIsRTL || !(embeddingLevel & 1) && !lineIsRTL) ==
(aPos->mDirection == eDirPrevious)) {
GetFirstLeaf(aPresContext, framePtr);
if (*framePtr) {
nsBidiLevel embeddingLevel = nsBidiPresUtils::GetFrameEmbeddingLevel(*framePtr);
if (((embeddingLevel & 1) && lineIsRTL || !(embeddingLevel & 1) && !lineIsRTL) ==
(aPos->mDirection == eDirPrevious)) {
GetFirstLeaf(aPresContext, framePtr);
} else {
GetLastLeaf(aPresContext, framePtr);
}
atLineEdge = *framePtr == traversedFrame;
} else {
GetLastLeaf(aPresContext, framePtr);
atLineEdge = PR_TRUE;
}
atLineEdge = *framePtr == traversedFrame;
} else
#endif
{

2
layout/generic/nsLineBox.cpp
View File

@@ -741,6 +741,8 @@ nsLineIterator::CheckLineOrder(PRInt32 aLine,
if (!line->mFirstChild) { // empty line
*aIsReordered = PR_FALSE;
*aFirstVisual = nsnull;
*aLastVisual = nsnull;
return NS_OK;
}

2
layout/tables/nsTableRowGroupFrame.cpp
View File

@@ -1946,6 +1946,8 @@ nsTableRowGroupFrame::CheckLineOrder(PRInt32 aLine,
nsIFrame **aLastVisual)
{
*aIsReordered = PR_FALSE;
*aFirstVisual = nsnull;
*aLastVisual = nsnull;
return NS_OK;
}
#endif // IBMBIDI