From a54e7d816c81709f9ecada40f0ab6803999d4116 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Fri, 9 Feb 2007 02:27:53 +0000
Subject: [PATCH] Fixing Mac bustage and adding a flag per roc.  Bug 368799.

---
 gfx/thebes/src/gfxAtsuiFonts.cpp   | 4 ++--
 gfx/thebes/src/gfxWindowsFonts.cpp | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gfx/thebes/src/gfxAtsuiFonts.cpp b/gfx/thebes/src/gfxAtsuiFonts.cpp
index 4d2902a56195..087558b894e2 100644
--- a/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/gfx/thebes/src/gfxAtsuiFonts.cpp
@@ -344,7 +344,7 @@ public:
     gfxWrapperTextRun(gfxAtsuiFontGroup *aGroup,
                       const PRUint8* aString, PRUint32 aLength,
                       gfxTextRunFactory::Parameters* aParams)
-        : gfxTextRun(aParams, PR_TRUE),
+        : gfxTextRun(aParams),
           mContext(aParams->mContext),
           mInner(NS_ConvertASCIItoUTF16(nsDependentCSubstring(reinterpret_cast<const char*>(aString),
                                         reinterpret_cast<const char*>(aString + aLength))),
@@ -356,7 +356,7 @@ public:
     gfxWrapperTextRun(gfxAtsuiFontGroup *aGroup,
                       const PRUnichar* aString, PRUint32 aLength,
                       gfxTextRunFactory::Parameters* aParams)
-        : gfxTextRun(aParams, PR_TRUE), mContext(aParams->mContext),
+        : gfxTextRun(aParams), mContext(aParams->mContext),
           mInner(nsDependentSubstring(aString, aString + aLength), aGroup),
           mLength(aLength)
     {
diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
index 0ad90ae264b0..e28981816349 100644
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -654,6 +654,7 @@ gfxTextRun *
 gfxWindowsFontGroup::MakeTextRun(const PRUint8* aString, PRUint32 aLength,
                                  Parameters* aParams)
 {
+    aParams->mFlags |= gfxTextRunFactory::TEXT_IS_8BIT;
     return new gfxWrapperTextRun(this, aString, aLength, aParams);
 }