]>
Commit | Line | Data |
---|---|---|
e36ee87a | 1 | diff -pruN -x '.moz*' -x .deps -x 'thunderbird*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp |
2 | --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-12-20 12:53:26.000000000 +0900 | |
3 | +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-20 15:43:14.000000000 +0900 | |
4 | @@ -2097,11 +2097,11 @@ nsTextFrame::PaintTextDecorations(nsIRen | |
5 | nsRect rect = GetRect(); | |
6 | while(aDetails){ | |
7 | const nscoord* sp= aSpacing; | |
8 | - PRInt32 startOffset = 0; | |
9 | - PRInt32 textWidth = 0; | |
10 | - PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); | |
11 | - PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); | |
12 | - PRInt32 i; | |
13 | + PRUint32 startOffset = 0; | |
14 | + PRUint32 textWidth = 0; | |
15 | + PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); | |
16 | + PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); | |
17 | + PRInt32 i; | |
18 | if ((start < end) && ((aLength - start) > 0)) | |
19 | { | |
20 | //aDetails allready processed to have offsets from frame start not content offsets | |
21 | @@ -2117,7 +2117,7 @@ nsTextFrame::PaintTextDecorations(nsIRen | |
22 | } | |
23 | } | |
24 | else | |
25 | - aRenderingContext.GetWidth(aText, start, startOffset); | |
26 | + aRenderingContext.GetRangeWidth(aText, aLength, 0, start, startOffset); | |
27 | } | |
28 | if (sp){ | |
29 | for (i = start; i < end;i ++){ | |
30 | @@ -2125,8 +2125,7 @@ nsTextFrame::PaintTextDecorations(nsIRen | |
31 | } | |
32 | } | |
33 | else | |
34 | - aRenderingContext.GetWidth(aText + start, | |
35 | - PRUint32(end - start), textWidth); | |
36 | + aRenderingContext.GetRangeWidth(aText, aLength, start, end, textWidth); | |
37 | ||
38 | } | |
39 | nscoord offset, size; |