From b354c81d35a374bcffa4c6cc1a260c41625777be Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org" <dbaron%dbaron.org>
Date: Sun, 18 Jul 2004 18:21:03 +0000
Subject: [PATCH] Remove mSurface and SetDrawingSurface to fix bustage. 
 mSurface was a write-only void* variable taking inconsistent types.

---
 gfx/src/mac/nsDeviceContextMac.cpp    | 2 --
 gfx/src/mac/nsDeviceContextMac.h      | 3 ---
 gfx/src/mac/nsRenderingContextMac.cpp | 1 -
 3 files changed, 6 deletions(-)

diff --git a/gfx/src/mac/nsDeviceContextMac.cpp b/gfx/src/mac/nsDeviceContextMac.cpp
index 41981d93d96..8cadd3389b7 100644
--- a/gfx/src/mac/nsDeviceContextMac.cpp
+++ b/gfx/src/mac/nsDeviceContextMac.cpp
@@ -78,7 +78,6 @@ PRUint32 nsDeviceContextMac::sNumberOfScreens = 0;
  */
 nsDeviceContextMac :: nsDeviceContextMac()
   : DeviceContextImpl(),
-    mSurface(nsnull),
     mOldPort(nsnull)
 {
 }
@@ -696,7 +695,6 @@ GrafPtr	thePort;
  		::GetPort(&mOldPort);
  		thePort = (GrafPtr)::PrOpenDoc(((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrtRec,nsnull,nsnull);
   	((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrinterPort = (TPrPort*)thePort;
-  	SetDrawingSurface(((nsDeviceContextSpecMac*)(this->mSpec).get())->mPrtRec);
   	SetPort(thePort);
   }
   return NS_OK;
diff --git a/gfx/src/mac/nsDeviceContextMac.h b/gfx/src/mac/nsDeviceContextMac.h
index b55cbaec83e..d767216d350 100644
--- a/gfx/src/mac/nsDeviceContextMac.h
+++ b/gfx/src/mac/nsDeviceContextMac.h
@@ -67,8 +67,6 @@ public:
   NS_IMETHOD  GetScrollBarDimensions(float &aWidth, float &aHeight) const;
   NS_IMETHOD  GetSystemFont(nsSystemFontID anID, nsFont *aFont) const;
 
-	void 				SetDrawingSurface(nsIDrawingSurface*  aSurface) { mSurface = aSurface; }
-
   NS_IMETHOD 	CheckFontExistence(const nsString& aFontName);
   NS_IMETHOD 	GetDepth(PRUint32& aDepth);
 
@@ -99,7 +97,6 @@ protected:
 
   void FindScreenForSurface ( nsIScreen** outScreen ) ;
 
-  nsIDrawingSurface* 			mSurface;
   Rect									mPageRect;
   nsCOMPtr<nsIDeviceContextSpec> mSpec;
   GrafPtr								mOldPort;
diff --git a/gfx/src/mac/nsRenderingContextMac.cpp b/gfx/src/mac/nsRenderingContextMac.cpp
index f73cb60ecbb..1c5091bd715 100644
--- a/gfx/src/mac/nsRenderingContextMac.cpp
+++ b/gfx/src/mac/nsRenderingContextMac.cpp
@@ -232,7 +232,6 @@ void nsRenderingContextMac::SelectDrawingSurface(nsDrawingSurfaceMac* aSurface,
 	if (!mContext) return;
 	
 	// GS and context initializations
-	((nsDeviceContextMac *)mContext)->SetDrawingSurface(mPort);
 #if 0
 	((nsDeviceContextMac *)mContext)->InstallColormap();
 #endif