From 257efbef6c14044d3e8bf8644f1192282e546bf5 Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 14 Nov 2002 19:53:20 +0000
Subject: [PATCH] #176609 r=mkaply, sr=blizzard (platform specific code) OS/2
 only - use browser DPI for bitmap fonts as well

git-svn-id: svn://10.0.0.236/trunk@133841 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/os2/nsDeviceContextOS2.h |  1 +
 mozilla/gfx/src/os2/nsFontMetricsOS2.cpp | 10 ++--------
 mozilla/gfx/src/os2/nsFontMetricsOS2.h   |  1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mozilla/gfx/src/os2/nsDeviceContextOS2.h b/mozilla/gfx/src/os2/nsDeviceContextOS2.h
index b1e0245c10a..fc6334a38bb 100644
--- a/mozilla/gfx/src/os2/nsDeviceContextOS2.h
+++ b/mozilla/gfx/src/os2/nsDeviceContextOS2.h
@@ -99,6 +99,7 @@ public:
   // Static Helper Methods
   static char* GetACPString(const nsString& aStr);
   nsresult   SetDPI(PRInt32 aPrefDPI);
+  int        GetDPI() { return mDpi; };
 
 protected:
   virtual ~nsDeviceContextOS2();
diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
index 1171c8a18b8..4e6783f95ca 100644
--- a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
+++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
@@ -68,7 +68,6 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 nsVoidArray  *nsFontMetricsOS2::gGlobalFonts = nsnull;
 PRBool        nsFontMetricsOS2::gSubstituteVectorFonts = PR_TRUE;
 PLHashTable  *nsFontMetricsOS2::gFamilyNames = nsnull;
-long          nsFontMetricsOS2::gSystemRes = 0;
 int           nsFontMetricsOS2::gCachedIndex = 0;
 nsICollation *nsFontMetricsOS2::gCollation = nsnull;
 
@@ -387,12 +386,6 @@ InitGlobals(void)
 
   ulSystemCodePage = WinQueryCp(HMQ_CURRENT);
 
-   // find system screen resolution. used here and in RealizeFont
-  HPS ps = ::WinGetScreenPS(HWND_DESKTOP);
-  HDC hdc = GFX (::GpiQueryDevice (ps), HDC_ERROR);
-  GFX (::DevQueryCaps(hdc, CAPS_HORIZONTAL_FONT_RES, 1, &nsFontMetricsOS2::gSystemRes), FALSE);
-  ::WinReleasePS(ps);
-
   if( !nsFontMetricsOS2::gGlobalFonts )
   {
     nsresult res = nsFontMetricsOS2::InitializeGlobalFonts();
@@ -541,11 +534,12 @@ nsFontMetricsOS2::SetFontHandle( HPS aPS, nsFontOS2* aFont )
     {
       long lFonts = 0;
       FONTMETRICS* pMetrics = getMetrics( lFonts, fattrs->szFacename, aPS);
+      int browserRes = mDeviceContext->GetDPI();
 
       int curPoints = 0;
       for( int i = 0; i < lFonts; i++)
       {
-        if( pMetrics[i].sYDeviceRes == gSystemRes )
+        if( pMetrics[i].sYDeviceRes == browserRes )
         {
           if (pMetrics[i].sNominalPointSize / 10 == points)
           {
diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.h b/mozilla/gfx/src/os2/nsFontMetricsOS2.h
index c44c7c827b7..e663aa4099f 100644
--- a/mozilla/gfx/src/os2/nsFontMetricsOS2.h
+++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.h
@@ -198,7 +198,6 @@ class nsFontMetricsOS2 : public nsIFontMetrics
 
   static nsVoidArray*  gGlobalFonts;
   static PLHashTable*  gFamilyNames;
-  static long          gSystemRes;
   static nsICollation* gCollation;
   
   nsStringArray       mFonts;