]>
Commit | Line | Data |
---|---|---|
fa18ca2f AM |
1 | diff -pruN -x '.moz*' -x .deps -x 'firefox*' -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-08-26 13:33:35.000000000 +0900 | |
3 | +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-13 20:54:32.000000000 +0900 | |
4 | @@ -4261,12 +4261,10 @@ nsTextFrame::GetPointFromOffset(nsPresCo | |
5 | if (tc) { | |
6 | totalLength = tc->Text()->GetLength(); // raw value which includes whitespace | |
7 | } | |
8 | - if ((hitLength == textLength) && (inOffset = mContentLength) && | |
9 | - (mContentOffset + mContentLength == totalLength)) { | |
10 | - // no need to re-measure when at the end of the last-in-flow | |
11 | - } | |
12 | + if (hitLength > 0) | |
13 | + inRendContext->GetRangeWidth(paintBuffer.mBuffer, textLength, 0, hitLength, (PRUint32&)width); | |
14 | else | |
15 | - inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width); | |
16 | + width = 0; | |
17 | } | |
18 | if ((hitLength == textLength) && (TEXT_TRIMMED_WS & mState)) { | |
19 | // |