From dcdfde1d6102d09eecf4f7a0f743a96f3fb96697 Mon Sep 17 00:00:00 2001
From: "rods%netscape.com" <rods%netscape.com>
Date: Thu, 3 Feb 2000 15:42:27 +0000
Subject: [PATCH] Caches parent DC to be used for GetSystemAttributes, needed
 for getting scrollbar information (in pixels). r=dcone b=24367

---
 gfx/src/ps/nsDeviceContextPS.cpp | 25 ++++++++++++-------------
 gfx/src/ps/nsDeviceContextPS.h   |  1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/gfx/src/ps/nsDeviceContextPS.cpp b/gfx/src/ps/nsDeviceContextPS.cpp
index e6f86eb4a12..ec935a64222 100644
--- a/gfx/src/ps/nsDeviceContextPS.cpp
+++ b/gfx/src/ps/nsDeviceContextPS.cpp
@@ -39,7 +39,7 @@ nsDeviceContextPS :: nsDeviceContextPS()
 
   NS_INIT_REFCNT();
   mSpec = nsnull; 
-
+  mParentDeviceContext = nsnull;
 }
 
 /** ---------------------------------------------------
@@ -59,6 +59,7 @@ PRInt32 i, n;
   }
   mFontMetrics.Clear();
   NS_IF_RELEASE(mSpec);
+  NS_IF_RELEASE(mParentDeviceContext);
 
 }
 
@@ -79,7 +80,7 @@ NS_IMPL_ISUPPORTS_INHERITED(nsDeviceContextPS,
  *	@update 12/21/98 dwc
  */
 NS_IMETHODIMP
-nsDeviceContextPS::InitDeviceContextPS(nsIDeviceContext *aCreatingDeviceContext,nsIDeviceContext *aPrinterContext)
+nsDeviceContextPS::InitDeviceContextPS(nsIDeviceContext *aCreatingDeviceContext,nsIDeviceContext *aParentContext)
 {
 float origscale, newscale;
 float t2d, a2d;
@@ -90,15 +91,18 @@ float t2d, a2d;
   mPixelsToTwips = 1.0f / mTwipsToPixels;
 
   GetTwipsToDevUnits(newscale);
-  aPrinterContext->GetTwipsToDevUnits(origscale);
+  aParentContext->GetTwipsToDevUnits(origscale);
   mCPixelScale = newscale / origscale;
 
-  aPrinterContext->GetTwipsToDevUnits(t2d);
-  aPrinterContext->GetAppUnitsToDevUnits(a2d);
+  aParentContext->GetTwipsToDevUnits(t2d);
+  aParentContext->GetAppUnitsToDevUnits(a2d);
 
   mAppUnitsToDevUnits = (a2d / t2d) * mTwipsToPixels;
   mDevUnitsToAppUnits = 1.0f / mAppUnitsToDevUnits;
 
+  mParentDeviceContext = aParentContext;
+  NS_ASSERTION(mParentDeviceContext, "aCreatingDeviceContext cannot be NULL!!!");
+  NS_ADDREF(mParentDeviceContext);
   return  NS_OK;
 }
 
@@ -231,15 +235,10 @@ NS_IMETHODIMP nsDeviceContextPS :: CheckFontExistence(const nsString& aFontName)
 
 NS_IMETHODIMP nsDeviceContextPS :: GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
 {
-
-  switch (anID) {
-    case 0:
-      break;
-    default:
-      break;
+  if (mParentDeviceContext != nsnull) {
+    return mParentDeviceContext->GetSystemAttribute(anID, aInfo);
   }
-
-  return NS_OK;
+  return NS_ERROR_FAILURE;
 }
 
 /** ---------------------------------------------------
diff --git a/gfx/src/ps/nsDeviceContextPS.h b/gfx/src/ps/nsDeviceContextPS.h
index c2465cb72f2..b210952576a 100644
--- a/gfx/src/ps/nsDeviceContextPS.h
+++ b/gfx/src/ps/nsDeviceContextPS.h
@@ -88,6 +88,7 @@ protected:
   nsDrawingSurface 			mSurface;
   PRUint32 							mDepth;
   nsIDeviceContextSpec  *mSpec;
+  nsIDeviceContext      *mParentDeviceContext;
   nsVoidArray           mFontMetrics;  // we are not using the normal font cache, this is special for PostScript.
   nsPostScriptObj       *mPSObj;