diff --git a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h
index 3c660f8449c..915289a06a6 100644
--- a/mozilla/layout/svg/base/src/nsSVGContainerFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGContainerFrame.h
@@ -58,10 +58,6 @@ protected:
 
   NS_IMETHOD InitSVG();
   
-private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
-
 public:
   nsSVGContainerFrame(nsStyleContext* aContext) :
     nsSVGContainerFrameBase(aContext) {}
@@ -93,10 +89,9 @@ public:
 
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 public:
   // nsIFrame:
diff --git a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h
index b35ec678c21..a3b30d131d2 100644
--- a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.h
@@ -58,8 +58,9 @@ protected:
   // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
+
 public:
   // nsIFrame:  
   virtual void Destroy();
diff --git a/mozilla/layout/svg/base/src/nsSVGGradientFrame.h b/mozilla/layout/svg/base/src/nsSVGGradientFrame.h
index 4dc54b37ec8..fb53f0c77de 100644
--- a/mozilla/layout/svg/base/src/nsSVGGradientFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGGradientFrame.h
@@ -63,9 +63,11 @@ public:
 
   // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
+private:
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
+public:
   // nsISVGValueObserver interface:
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable, 
                                      nsISVGValue::modificationType aModType);
diff --git a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
index 5a30f490600..3d0421ceb59 100644
--- a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
@@ -59,8 +59,8 @@ protected:
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 public:
   // nsIFrame:
diff --git a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h
index 225e4ff5950..e4a076aff0d 100644
--- a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.h
@@ -62,8 +62,9 @@ protected:
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
+
 public:
   // nsIFrame:
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
diff --git a/mozilla/layout/svg/base/src/nsSVGPatternFrame.h b/mozilla/layout/svg/base/src/nsSVGPatternFrame.h
index 84282e68945..7a3f1e9ba82 100644
--- a/mozilla/layout/svg/base/src/nsSVGPatternFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGPatternFrame.h
@@ -76,9 +76,11 @@ public:
 
   // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
+private:
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
+public:
   // nsISVGValueObserver interface:
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable, 
                                      nsISVGValue::modificationType aModType);
diff --git a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h
index 7e104ead42f..c7f98bc1e58 100644
--- a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.h
@@ -58,8 +58,8 @@ protected:
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 public:
   // nsIFrame:
diff --git a/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.h b/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.h
index 88d69b946b9..fe5ea222614 100755
--- a/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.h
@@ -61,10 +61,9 @@ public:
   
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 public:
   // nsIFrame
diff --git a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h
index 6a1555cb376..0fa2f489d80 100644
--- a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h
+++ b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.h
@@ -88,10 +88,9 @@ public:
 
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 protected:
   virtual ~nsSVGTextPathFrame();
diff --git a/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp b/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
index 0f77bcd025e..299dd3491d3 100644
--- a/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
@@ -55,10 +55,9 @@ protected:
 
    // nsISupports interface:
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
 private:
-  NS_IMETHOD_(nsrefcnt) AddRef() { return NS_OK; }
-  NS_IMETHOD_(nsrefcnt) Release() { return NS_OK; }  
+  NS_IMETHOD_(nsrefcnt) AddRef() { return 1; }
+  NS_IMETHOD_(nsrefcnt) Release() { return 1; }
 
 public:
   // nsIFrame interface: