diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp
index 8af8b994800..c62b470b09b 100644
--- a/mozilla/content/base/src/nsStyleContext.cpp
+++ b/mozilla/content/base/src/nsStyleContext.cpp
@@ -1153,7 +1153,7 @@ PRUint32 StyleTextImpl::ComputeCRC32(PRUint32 aCrc) const
   crc = StyleCoordCRC(crc,&mWordSpacing);
   crc = StyleCoordCRC(crc,&mVerticalAlign);
 #endif
-  return aCrc;
+  return crc;
 }
 
 // --------------------
@@ -1948,7 +1948,7 @@ public:
 
   friend class StyleContextImpl;
 
-  virtual void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
+  void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
 
 private:  // all data and methods private: only friends have access
 
diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp
index 0d74af5ab63..9c2eb0137f4 100644
--- a/mozilla/content/base/src/nsStyleSet.cpp
+++ b/mozilla/content/base/src/nsStyleSet.cpp
@@ -683,8 +683,10 @@ EnumRulesMatching(nsISupports* aProcessor, void* aData)
 }
 
 #ifdef SHARE_STYLECONTEXTS
-  static int gNewCount=0;
-  static int gSharedCount=0;
+  #ifdef NOISY_DEBUG
+    static int gNewCount=0;
+    static int gSharedCount=0;
+  #endif
 #endif
 
 nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext, 
diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp
index 8af8b994800..c62b470b09b 100644
--- a/mozilla/layout/base/src/nsStyleContext.cpp
+++ b/mozilla/layout/base/src/nsStyleContext.cpp
@@ -1153,7 +1153,7 @@ PRUint32 StyleTextImpl::ComputeCRC32(PRUint32 aCrc) const
   crc = StyleCoordCRC(crc,&mWordSpacing);
   crc = StyleCoordCRC(crc,&mVerticalAlign);
 #endif
-  return aCrc;
+  return crc;
 }
 
 // --------------------
@@ -1948,7 +1948,7 @@ public:
 
   friend class StyleContextImpl;
 
-  virtual void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
+  void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
 
 private:  // all data and methods private: only friends have access
 
diff --git a/mozilla/layout/base/src/nsStyleSet.cpp b/mozilla/layout/base/src/nsStyleSet.cpp
index 0d74af5ab63..9c2eb0137f4 100644
--- a/mozilla/layout/base/src/nsStyleSet.cpp
+++ b/mozilla/layout/base/src/nsStyleSet.cpp
@@ -683,8 +683,10 @@ EnumRulesMatching(nsISupports* aProcessor, void* aData)
 }
 
 #ifdef SHARE_STYLECONTEXTS
-  static int gNewCount=0;
-  static int gSharedCount=0;
+  #ifdef NOISY_DEBUG
+    static int gNewCount=0;
+    static int gSharedCount=0;
+  #endif
 #endif
 
 nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext, 
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index 8af8b994800..c62b470b09b 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -1153,7 +1153,7 @@ PRUint32 StyleTextImpl::ComputeCRC32(PRUint32 aCrc) const
   crc = StyleCoordCRC(crc,&mWordSpacing);
   crc = StyleCoordCRC(crc,&mVerticalAlign);
 #endif
-  return aCrc;
+  return crc;
 }
 
 // --------------------
@@ -1948,7 +1948,7 @@ public:
 
   friend class StyleContextImpl;
 
-  virtual void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
+  void SizeOf(nsISizeOfHandler *aSizeOfHandler, PRUint32 &aSize);
 
 private:  // all data and methods private: only friends have access
 
diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp
index 0d74af5ab63..9c2eb0137f4 100644
--- a/mozilla/layout/style/nsStyleSet.cpp
+++ b/mozilla/layout/style/nsStyleSet.cpp
@@ -683,8 +683,10 @@ EnumRulesMatching(nsISupports* aProcessor, void* aData)
 }
 
 #ifdef SHARE_STYLECONTEXTS
-  static int gNewCount=0;
-  static int gSharedCount=0;
+  #ifdef NOISY_DEBUG
+    static int gNewCount=0;
+    static int gSharedCount=0;
+  #endif
 #endif
 
 nsIStyleContext* StyleSetImpl::GetContext(nsIPresContext* aPresContext,