From b13e53df9d97ef9ea254ba2ae1bcbf1fea4e990c Mon Sep 17 00:00:00 2001
From: "masayuki%d-toybox.com"
 <masayuki%d-toybox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 26 Mar 2008 21:43:43 +0000
Subject: [PATCH] Bug 425249 gfxWindowsPlatform::InitBadUnderlineList() is
 broken by bug 424018 r+b1.9+a1.9b5=stuart

git-svn-id: svn://10.0.0.236/trunk@248612 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/thebes/public/gfxWindowsFonts.h   | 1 +
 mozilla/gfx/thebes/src/gfxWindowsFonts.cpp    | 2 ++
 mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp | 5 +----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/gfx/thebes/public/gfxWindowsFonts.h b/mozilla/gfx/thebes/public/gfxWindowsFonts.h
index 9f75f1c2ecc..13f7a284770 100644
--- a/mozilla/gfx/thebes/public/gfxWindowsFonts.h
+++ b/mozilla/gfx/thebes/public/gfxWindowsFonts.h
@@ -77,6 +77,7 @@ private:
 public:
     nsTArray<nsRefPtr<FontEntry> > mVariations;
     nsString mName;
+    PRPackedBool mIsBadUnderlineFont;
 
 private:
     PRBool mHasStyles;
diff --git a/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp b/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
index bcd8f471c51..d2724b34611 100644
--- a/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -203,6 +203,8 @@ FontFamily::FamilyAddStylesProc(const ENUMLOGFONTEXW *lpelfe,
         }
     }
 
+    fe->mIsBadUnderlineFont = ff->mIsBadUnderlineFont;
+
     // read in the character map
     logFont.lfCharSet = DEFAULT_CHARSET;
     HFONT font = CreateFontIndirectW(&logFont);
diff --git a/mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp b/mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp
index 552579f38cd..52874b1b721 100644
--- a/mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/mozilla/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -285,10 +285,7 @@ gfxWindowsPlatform::InitBadUnderlineList()
         FontFamily *ff = FindFontFamily(resolved);
         if (!ff)
             continue;
-        for (PRUint32 j = 0; j < ff->mVariations.Length(); ++j) {
-            nsRefPtr<FontEntry> fe = ff->mVariations[j];
-            fe->mIsBadUnderlineFont = 1;
-        }
+        ff->mIsBadUnderlineFont = 1;
     }
 }