bf7b1b1877
Thu Dec 21 2006 Behdad Esfahbod <besfahbo@redhat.com> 1.5.0.9-5 - Added firefox-1.5-pango-underline.patch Wed Dec 20 2006 Behdad Esfahbod <besfahbo@redhat.com> 1.5.0.9-4 - Added firefox-1.5-pango-justified-range.patch Tue Dec 19 2006 Behdad Esfahbod <besfahbo@redhat.com> 1.5.0.9-3 - Added firefox-1.5-pango-cursor-position-more.patch Tue Dec 19 2006 Matthias Clasen <mclasen@redhat.com> 1.5.0.9-2 - Add a Requires: launchmail (#219884) Tue Dec 19 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.9-1 - Update to 1.5.0.9 - Take firefox's pango fixes - Don't offer to import...nothing.
20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
Diff
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
|
|
--- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-08-26 13:33:35.000000000 +0900
|
|
+++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-13 20:54:32.000000000 +0900
|
|
@@ -4261,12 +4261,10 @@ nsTextFrame::GetPointFromOffset(nsPresCo
|
|
if (tc) {
|
|
totalLength = tc->Text()->GetLength(); // raw value which includes whitespace
|
|
}
|
|
- if ((hitLength == textLength) && (inOffset = mContentLength) &&
|
|
- (mContentOffset + mContentLength == totalLength)) {
|
|
- // no need to re-measure when at the end of the last-in-flow
|
|
- }
|
|
+ if (hitLength > 0)
|
|
+ inRendContext->GetRangeWidth(paintBuffer.mBuffer, mContentLength, 0, hitLength, (PRUint32&)width);
|
|
else
|
|
- inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width);
|
|
+ width = 0;
|
|
}
|
|
if ((hitLength == textLength) && (TEXT_TRIMMED_WS & mState)) {
|
|
//
|