From 4defff2d32177bca02fed37a588d308dcabf7469 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Fri, 30 Nov 2001 22:47:57 +0000 Subject: [PATCH] #107905 r=mkaply, sr=attinasi OS/2 only - don't shortcut font computations for fixed with fonts git-svn-id: svn://10.0.0.236/trunk@109393 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsTextFrame.cpp | 6 +++++- mozilla/layout/html/base/src/nsTextFrame.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 26f02a9e004..16420438955 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -4395,12 +4395,16 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext, PRBool endsInNewline = PR_FALSE; PRBool justDidFirstLetter = PR_FALSE; nsTextDimensions dimensions, lastWordDimensions; -#if defined(_WIN32) || defined(XP_OS2) +#if defined(_WIN32) PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mPreformatted && !aTs.mSmallCaps && !aTs.mWordSpacing && !aTs.mLetterSpacing && aTextData.mWrapping; // Don't measure text runs with letter spacing active, it doesn't work // it also doesn't work if we are not word-wrapping (bug 42832) +#elif defined(XP_OS2) + PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mSmallCaps && + !aTs.mWordSpacing && !aTs.mLetterSpacing && + aTextData.mWrapping; #else PRBool measureTextRuns = PR_FALSE; #endif diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 26f02a9e004..16420438955 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -4395,12 +4395,16 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext, PRBool endsInNewline = PR_FALSE; PRBool justDidFirstLetter = PR_FALSE; nsTextDimensions dimensions, lastWordDimensions; -#if defined(_WIN32) || defined(XP_OS2) +#if defined(_WIN32) PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mPreformatted && !aTs.mSmallCaps && !aTs.mWordSpacing && !aTs.mLetterSpacing && aTextData.mWrapping; // Don't measure text runs with letter spacing active, it doesn't work // it also doesn't work if we are not word-wrapping (bug 42832) +#elif defined(XP_OS2) + PRBool measureTextRuns = !aTextData.mComputeMaxWordWidth && !aTs.mSmallCaps && + !aTs.mWordSpacing && !aTs.mLetterSpacing && + aTextData.mWrapping; #else PRBool measureTextRuns = PR_FALSE; #endif