4a48add
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
4a48add
--- mozilla.orig/layout/generic/nsTextFrame.cpp	2006-08-26 13:33:35.000000000 +0900
4a48add
+++ mozilla/layout/generic/nsTextFrame.cpp	2006-12-13 20:54:32.000000000 +0900
4a48add
@@ -4261,12 +4261,10 @@ nsTextFrame::GetPointFromOffset(nsPresCo
4a48add
       if (tc) {
4a48add
         totalLength = tc->Text()->GetLength(); // raw value which includes whitespace
4a48add
       }
4a48add
-      if ((hitLength == textLength) && (inOffset = mContentLength) &&
4a48add
-          (mContentOffset + mContentLength == totalLength)) {
4a48add
-        // no need to re-measure when at the end of the last-in-flow
4a48add
-      }
4a48add
+      if (hitLength > 0)
4a48add
+	inRendContext->GetRangeWidth(paintBuffer.mBuffer, textLength, 0, hitLength, (PRUint32&)width);
4a48add
       else
4a48add
-        inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width);
4a48add
+	width = 0;
4a48add
     }
4a48add
     if ((hitLength == textLength) && (TEXT_TRIMMED_WS & mState)) {
4a48add
       //