diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
index 658df48d525..92178c2f1c9 100644
--- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp
+++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
@@ -417,6 +417,16 @@ void nsCSSDisplay::List(FILE* out, PRInt32 aIndent) const
 
 // --- nsCSSMargin -----------------
 
+inline void nsCSSMargin::EnsureBorderColors()
+{
+  if (!mBorderColors) {
+    PRInt32 i;
+    mBorderColors = new nsCSSValueList*[4];
+    for (i = 0; i < 4; i++)
+      mBorderColors[i] = nsnull;
+  }
+}
+
 nsCSSMargin::nsCSSMargin(void)
   : mMargin(nsnull), mPadding(nsnull), 
     mBorderWidth(nsnull), mBorderColor(nsnull), mBorderColors(nsnull),
@@ -536,16 +546,6 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const
   fputs(NS_LossyConvertUCS2toASCII(buffer).get(), out);
 }
 
-inline void nsCSSMargin::EnsureBorderColors()
-{
-  if (!mBorderColors) {
-    PRInt32 i;
-    mBorderColors = new nsCSSValueList*[4];
-    for (i = 0; i < 4; i++)
-      mBorderColors[i] = nsnull;
-  }
-}
-
 // --- nsCSSPosition -----------------
 
 nsCSSPosition::nsCSSPosition(void)
diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp
index 658df48d525..92178c2f1c9 100644
--- a/mozilla/content/html/style/src/nsCSSStruct.cpp
+++ b/mozilla/content/html/style/src/nsCSSStruct.cpp
@@ -417,6 +417,16 @@ void nsCSSDisplay::List(FILE* out, PRInt32 aIndent) const
 
 // --- nsCSSMargin -----------------
 
+inline void nsCSSMargin::EnsureBorderColors()
+{
+  if (!mBorderColors) {
+    PRInt32 i;
+    mBorderColors = new nsCSSValueList*[4];
+    for (i = 0; i < 4; i++)
+      mBorderColors[i] = nsnull;
+  }
+}
+
 nsCSSMargin::nsCSSMargin(void)
   : mMargin(nsnull), mPadding(nsnull), 
     mBorderWidth(nsnull), mBorderColor(nsnull), mBorderColors(nsnull),
@@ -536,16 +546,6 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const
   fputs(NS_LossyConvertUCS2toASCII(buffer).get(), out);
 }
 
-inline void nsCSSMargin::EnsureBorderColors()
-{
-  if (!mBorderColors) {
-    PRInt32 i;
-    mBorderColors = new nsCSSValueList*[4];
-    for (i = 0; i < 4; i++)
-      mBorderColors[i] = nsnull;
-  }
-}
-
 // --- nsCSSPosition -----------------
 
 nsCSSPosition::nsCSSPosition(void)
diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp
index 658df48d525..92178c2f1c9 100644
--- a/mozilla/layout/style/nsCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsCSSDeclaration.cpp
@@ -417,6 +417,16 @@ void nsCSSDisplay::List(FILE* out, PRInt32 aIndent) const
 
 // --- nsCSSMargin -----------------
 
+inline void nsCSSMargin::EnsureBorderColors()
+{
+  if (!mBorderColors) {
+    PRInt32 i;
+    mBorderColors = new nsCSSValueList*[4];
+    for (i = 0; i < 4; i++)
+      mBorderColors[i] = nsnull;
+  }
+}
+
 nsCSSMargin::nsCSSMargin(void)
   : mMargin(nsnull), mPadding(nsnull), 
     mBorderWidth(nsnull), mBorderColor(nsnull), mBorderColors(nsnull),
@@ -536,16 +546,6 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const
   fputs(NS_LossyConvertUCS2toASCII(buffer).get(), out);
 }
 
-inline void nsCSSMargin::EnsureBorderColors()
-{
-  if (!mBorderColors) {
-    PRInt32 i;
-    mBorderColors = new nsCSSValueList*[4];
-    for (i = 0; i < 4; i++)
-      mBorderColors[i] = nsnull;
-  }
-}
-
 // --- nsCSSPosition -----------------
 
 nsCSSPosition::nsCSSPosition(void)
diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp
index 658df48d525..92178c2f1c9 100644
--- a/mozilla/layout/style/nsCSSStruct.cpp
+++ b/mozilla/layout/style/nsCSSStruct.cpp
@@ -417,6 +417,16 @@ void nsCSSDisplay::List(FILE* out, PRInt32 aIndent) const
 
 // --- nsCSSMargin -----------------
 
+inline void nsCSSMargin::EnsureBorderColors()
+{
+  if (!mBorderColors) {
+    PRInt32 i;
+    mBorderColors = new nsCSSValueList*[4];
+    for (i = 0; i < 4; i++)
+      mBorderColors[i] = nsnull;
+  }
+}
+
 nsCSSMargin::nsCSSMargin(void)
   : mMargin(nsnull), mPadding(nsnull), 
     mBorderWidth(nsnull), mBorderColor(nsnull), mBorderColors(nsnull),
@@ -536,16 +546,6 @@ void nsCSSMargin::List(FILE* out, PRInt32 aIndent) const
   fputs(NS_LossyConvertUCS2toASCII(buffer).get(), out);
 }
 
-inline void nsCSSMargin::EnsureBorderColors()
-{
-  if (!mBorderColors) {
-    PRInt32 i;
-    mBorderColors = new nsCSSValueList*[4];
-    for (i = 0; i < 4; i++)
-      mBorderColors[i] = nsnull;
-  }
-}
-
 // --- nsCSSPosition -----------------
 
 nsCSSPosition::nsCSSPosition(void)