Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Port to new nsILineIterator api

Browse Source
This commit is contained in:
kipp%netscape.com 1999-10-12 23:25:19 +00:00
parent 2cd78b72d8
commit 5a9e69f0c8
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
layout/generic/nsFrame.cpp
View File

@ -1002,26 +1002,26 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext& aCX,
rect.x = offsetPoint.x; rect.x = offsetPoint.x;
rect.y = offsetPoint.y; rect.y = offsetPoint.y;
nscoord y1 = rect.y; nscoord ya = rect.y;
nscoord y2 = rect.y + rect.height; nscoord yb = rect.y + rect.height;
PRInt32 yDistance = PR_MIN(abs(y1 - aPoint.y),abs(y2 - aPoint.y)); PRInt32 yDistance = PR_MIN(abs(ya - aPoint.y),abs(yb - aPoint.y));
if (yDistance <= closestYDistance && rect.width > 0 && rect.height > 0) if (yDistance <= closestYDistance && rect.width > 0 && rect.height > 0)
{ {
if (yDistance < closestYDistance) if (yDistance < closestYDistance)
closestXDistance = HUGE_DISTANCE; closestXDistance = HUGE_DISTANCE;
nscoord x1 = rect.x; nscoord xa = rect.x;
nscoord x2 = rect.x + rect.width; nscoord xb = rect.x + rect.width;
if (x1 <= aPoint.x && x2 >= aPoint.x && y1 <= aPoint.y && y2 >= aPoint.y) if (xa <= aPoint.x && xb >= aPoint.x && ya <= aPoint.y && yb >= aPoint.y)
{ {
closestFrame = kid; closestFrame = kid;
break; break;
} }
PRInt32 xDistance = PR_MIN(abs(x1 - aPoint.x),abs(x2 - aPoint.x)); PRInt32 xDistance = PR_MIN(abs(xa - aPoint.x),abs(xb - aPoint.x));
if (xDistance < closestXDistance) if (xDistance < closestXDistance)
{ {
@ -2048,7 +2048,9 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsIFocusTracker *aTracker,
//we need to jump to new block frame. //we need to jump to new block frame.
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
result = it->GetLine(searchingLine, &firstFrame, &lineFrameCount,nonUsedRect); PRUint32 lineFlags;
result = it->GetLine(searchingLine, &firstFrame, &lineFrameCount,
nonUsedRect, &lineFlags);
if (!lineFrameCount) if (!lineFrameCount)
continue; continue;
if (NS_SUCCEEDED(result)){ if (NS_SUCCEEDED(result)){
@ -2295,7 +2297,9 @@ nsFrame::PeekOffset(nsPeekOffsetStruct *aPos)
PRInt32 lineFrameCount; PRInt32 lineFrameCount;
nsIFrame *firstFrame; nsIFrame *firstFrame;
nsRect usedRect; nsRect usedRect;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,usedRect); PRUint32 lineFlags;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,usedRect,
&lineFlags);
if (eSelectBeginLine == aPos->mAmount) if (eSelectBeginLine == aPos->mAmount)
{ {
if (firstFrame) if (firstFrame)
@ -2370,8 +2374,10 @@ nsFrame::PeekOffset(nsPeekOffsetStruct *aPos)
nsIFrame *lastFrame; nsIFrame *lastFrame;
nsRect nonUsedRect; nsRect nonUsedRect;
PRInt32 lineFrameCount; PRInt32 lineFrameCount;
PRUint32 lineFlags;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,nonUsedRect); result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,nonUsedRect,
&lineFlags);
if (NS_FAILED(result)) if (NS_FAILED(result))
return result; return result;

26
layout/html/base/src/nsFrame.cpp
View File

@ -1002,26 +1002,26 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext& aCX,
rect.x = offsetPoint.x; rect.x = offsetPoint.x;
rect.y = offsetPoint.y; rect.y = offsetPoint.y;
nscoord y1 = rect.y; nscoord ya = rect.y;
nscoord y2 = rect.y + rect.height; nscoord yb = rect.y + rect.height;
PRInt32 yDistance = PR_MIN(abs(y1 - aPoint.y),abs(y2 - aPoint.y)); PRInt32 yDistance = PR_MIN(abs(ya - aPoint.y),abs(yb - aPoint.y));
if (yDistance <= closestYDistance && rect.width > 0 && rect.height > 0) if (yDistance <= closestYDistance && rect.width > 0 && rect.height > 0)
{ {
if (yDistance < closestYDistance) if (yDistance < closestYDistance)
closestXDistance = HUGE_DISTANCE; closestXDistance = HUGE_DISTANCE;
nscoord x1 = rect.x; nscoord xa = rect.x;
nscoord x2 = rect.x + rect.width; nscoord xb = rect.x + rect.width;
if (x1 <= aPoint.x && x2 >= aPoint.x && y1 <= aPoint.y && y2 >= aPoint.y) if (xa <= aPoint.x && xb >= aPoint.x && ya <= aPoint.y && yb >= aPoint.y)
{ {
closestFrame = kid; closestFrame = kid;
break; break;
} }
PRInt32 xDistance = PR_MIN(abs(x1 - aPoint.x),abs(x2 - aPoint.x)); PRInt32 xDistance = PR_MIN(abs(xa - aPoint.x),abs(xb - aPoint.x));
if (xDistance < closestXDistance) if (xDistance < closestXDistance)
{ {
@ -2048,7 +2048,9 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsIFocusTracker *aTracker,
//we need to jump to new block frame. //we need to jump to new block frame.
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
result = it->GetLine(searchingLine, &firstFrame, &lineFrameCount,nonUsedRect); PRUint32 lineFlags;
result = it->GetLine(searchingLine, &firstFrame, &lineFrameCount,
nonUsedRect, &lineFlags);
if (!lineFrameCount) if (!lineFrameCount)
continue; continue;
if (NS_SUCCEEDED(result)){ if (NS_SUCCEEDED(result)){
@ -2295,7 +2297,9 @@ nsFrame::PeekOffset(nsPeekOffsetStruct *aPos)
PRInt32 lineFrameCount; PRInt32 lineFrameCount;
nsIFrame *firstFrame; nsIFrame *firstFrame;
nsRect usedRect; nsRect usedRect;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,usedRect); PRUint32 lineFlags;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,usedRect,
&lineFlags);
if (eSelectBeginLine == aPos->mAmount) if (eSelectBeginLine == aPos->mAmount)
{ {
if (firstFrame) if (firstFrame)
@ -2370,8 +2374,10 @@ nsFrame::PeekOffset(nsPeekOffsetStruct *aPos)
nsIFrame *lastFrame; nsIFrame *lastFrame;
nsRect nonUsedRect; nsRect nonUsedRect;
PRInt32 lineFrameCount; PRInt32 lineFrameCount;
PRUint32 lineFlags;
result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,nonUsedRect); result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,nonUsedRect,
&lineFlags);
if (NS_FAILED(result)) if (NS_FAILED(result))
return result; return result;