From b93772cbd45fd0288a8f9dc2aee1b39b7d4e72ae Mon Sep 17 00:00:00 2001
From: "tor%cs.brown.edu"
 <tor%cs.brown.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 18 Apr 2004 13:55:11 +0000
Subject: [PATCH] Bug 240274 - remove PopState() argument. r=blizzard,
 sr=bryner

git-svn-id: svn://10.0.0.236/trunk@155065 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsCSSRendering.cpp                       | 2 +-
 mozilla/layout/html/style/src/nsCSSRendering.cpp             | 2 +-
 .../layout/svg/renderer/src/libart/nsSVGLibartBitmapGdk.cpp  | 3 +--
 mozilla/widget/src/cocoa/nsChildView.mm                      | 5 +----
 mozilla/widget/src/mac/nsWindow.cpp                          | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp
index dac29474460..42d57a93bae 100644
--- a/mozilla/layout/base/nsCSSRendering.cpp
+++ b/mozilla/layout/base/nsCSSRendering.cpp
@@ -3240,7 +3240,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
 
 #if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
   // Restore clipping
-  aRenderingContext.PopState(clipState);
+  aRenderingContext.PopState();
 #endif
 
 }
diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp
index dac29474460..42d57a93bae 100644
--- a/mozilla/layout/html/style/src/nsCSSRendering.cpp
+++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp
@@ -3240,7 +3240,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
 
 #if (!defined(XP_UNIX) && !defined(XP_BEOS)) || defined(XP_MACOSX)
   // Restore clipping
-  aRenderingContext.PopState(clipState);
+  aRenderingContext.PopState();
 #endif
 
 }
diff --git a/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapGdk.cpp b/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapGdk.cpp
index b9211296749..4e62d5dfb5b 100644
--- a/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapGdk.cpp
+++ b/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapGdk.cpp
@@ -228,8 +228,7 @@ nsSVGLibartBitmapGdk::UnlockRenderingContext()
   mRenderingContext->GetDrawingSurface((nsDrawingSurface*)&surface);
   NS_ASSERTION(surface, "null surface");
 
-  PRBool clipEmpty;
-  mRenderingContext->PopState(clipEmpty);
+  mRenderingContext->PopState();
   mRenderingContext->SelectOffScreenDrawingSurface(mTempSurface);
   mTempSurface = nsnull;
   
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index 9ecfccab5c2..496efc28f2d 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -1476,10 +1476,7 @@ void nsChildView::EndDraw()
   mDrawing = PR_FALSE;
 
   if (mTempRenderingContextMadeHere)
-  {
-    PRBool clipEmpty;
-    mTempRenderingContext->PopState(clipEmpty);
-  }
+    mTempRenderingContext->PopState();
   NS_RELEASE(mTempRenderingContext);
 }
 
diff --git a/mozilla/widget/src/mac/nsWindow.cpp b/mozilla/widget/src/mac/nsWindow.cpp
index ce6a33c4815..4fc3cbe83fb 100644
--- a/mozilla/widget/src/mac/nsWindow.cpp
+++ b/mozilla/widget/src/mac/nsWindow.cpp
@@ -1184,8 +1184,7 @@ void nsWindow::EndDraw()
 		return;
 	mDrawing = PR_FALSE;
 
-	PRBool clipEmpty;
-	mTempRenderingContext->PopState(clipEmpty);
+	mTempRenderingContext->PopState();
 
 	NS_RELEASE(mTempRenderingContext);