diff --git a/mozilla/content/html/style/src/nsCSSKeywords.h b/mozilla/content/html/style/src/nsCSSKeywords.h
index 9f93701c849..4473a0c3bac 100644
--- a/mozilla/content/html/style/src/nsCSSKeywords.h
+++ b/mozilla/content/html/style/src/nsCSSKeywords.h
@@ -24,7 +24,7 @@
 
 #include "nslayout.h"
 
-struct nsStr;
+class nsString;
 class nsCString;
 
 /*
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a keyword string, return the enum value
-  static nsCSSKeyword LookupKeyword(const nsStr& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsCString& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsString& aKeyword);
 
   // Given a keyword enum, get the string value
   static const nsCString& GetStringValue(nsCSSKeyword aKeyword);
diff --git a/mozilla/content/html/style/src/nsCSSProps.h b/mozilla/content/html/style/src/nsCSSProps.h
index a10ecf76ba5..8180f359371 100644
--- a/mozilla/content/html/style/src/nsCSSProps.h
+++ b/mozilla/content/html/style/src/nsCSSProps.h
@@ -24,8 +24,8 @@
 
 #include "nslayout.h"
 
-struct nsStr;
 class nsCString;
+class nsString;
 
 /*
    Declare the enum list using the magic of preprocessing
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a property string, return the enum value
-  static nsCSSProperty LookupProperty(const nsStr& aProperty);
+  static nsCSSProperty LookupProperty(const nsString& aProperty);
+  static nsCSSProperty LookupProperty(const nsCString& aProperty);
 
   // Given a property enum, get the string value
   static const nsCString& GetStringValue(nsCSSProperty aProperty);
diff --git a/mozilla/content/shared/public/nsCSSKeywords.h b/mozilla/content/shared/public/nsCSSKeywords.h
index 9f93701c849..4473a0c3bac 100644
--- a/mozilla/content/shared/public/nsCSSKeywords.h
+++ b/mozilla/content/shared/public/nsCSSKeywords.h
@@ -24,7 +24,7 @@
 
 #include "nslayout.h"
 
-struct nsStr;
+class nsString;
 class nsCString;
 
 /*
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a keyword string, return the enum value
-  static nsCSSKeyword LookupKeyword(const nsStr& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsCString& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsString& aKeyword);
 
   // Given a keyword enum, get the string value
   static const nsCString& GetStringValue(nsCSSKeyword aKeyword);
diff --git a/mozilla/content/shared/public/nsCSSProps.h b/mozilla/content/shared/public/nsCSSProps.h
index a10ecf76ba5..8180f359371 100644
--- a/mozilla/content/shared/public/nsCSSProps.h
+++ b/mozilla/content/shared/public/nsCSSProps.h
@@ -24,8 +24,8 @@
 
 #include "nslayout.h"
 
-struct nsStr;
 class nsCString;
+class nsString;
 
 /*
    Declare the enum list using the magic of preprocessing
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a property string, return the enum value
-  static nsCSSProperty LookupProperty(const nsStr& aProperty);
+  static nsCSSProperty LookupProperty(const nsString& aProperty);
+  static nsCSSProperty LookupProperty(const nsCString& aProperty);
 
   // Given a property enum, get the string value
   static const nsCString& GetStringValue(nsCSSProperty aProperty);
diff --git a/mozilla/content/shared/src/nsCSSKeywords.cpp b/mozilla/content/shared/src/nsCSSKeywords.cpp
index d887d064afe..e1c02cd044e 100644
--- a/mozilla/content/shared/src/nsCSSKeywords.cpp
+++ b/mozilla/content/shared/src/nsCSSKeywords.cpp
@@ -114,7 +114,7 @@ nsCSSKeywords::ReleaseTable(void)
 
 
 nsCSSKeyword 
-nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
+nsCSSKeywords::LookupKeyword(const nsCString& aKeyword)
 {
   NS_ASSERTION(gKeywordTree, "no lookup table, needs addref");
   if (gKeywordTree) {
@@ -128,6 +128,12 @@ nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
   return eCSSKeyword_UNKNOWN;
 }
 
+nsCSSKeyword 
+nsCSSKeywords::LookupKeyword(const nsString& aKeyword) {
+  nsCAutoString theKeyword(aKeyword);
+  return LookupKeyword(theKeyword);
+}
+
 
 const nsCString& 
 nsCSSKeywords::GetStringValue(nsCSSKeyword aKeyword)
diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp
index ced147a5b06..2a01f8fd124 100644
--- a/mozilla/content/shared/src/nsCSSProps.cpp
+++ b/mozilla/content/shared/src/nsCSSProps.cpp
@@ -119,7 +119,7 @@ nsCSSProps::ReleaseTable(void)
 
 
 nsCSSProperty 
-nsCSSProps::LookupProperty(const nsStr& aProperty)
+nsCSSProps::LookupProperty(const nsCString& aProperty)
 {
   NS_ASSERTION(gPropertyTree, "no lookup table, needs addref");
   if (gPropertyTree) {
@@ -134,6 +134,13 @@ nsCSSProps::LookupProperty(const nsStr& aProperty)
 }
 
 
+nsCSSProperty 
+nsCSSProps::LookupProperty(const nsString& aProperty) {
+  nsCAutoString theProp(aProperty);
+  return LookupProperty(theProp);
+}
+
+
 const nsCString& 
 nsCSSProps::GetStringValue(nsCSSProperty aProperty)
 {
diff --git a/mozilla/layout/html/style/src/nsCSSKeywords.cpp b/mozilla/layout/html/style/src/nsCSSKeywords.cpp
index d887d064afe..e1c02cd044e 100644
--- a/mozilla/layout/html/style/src/nsCSSKeywords.cpp
+++ b/mozilla/layout/html/style/src/nsCSSKeywords.cpp
@@ -114,7 +114,7 @@ nsCSSKeywords::ReleaseTable(void)
 
 
 nsCSSKeyword 
-nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
+nsCSSKeywords::LookupKeyword(const nsCString& aKeyword)
 {
   NS_ASSERTION(gKeywordTree, "no lookup table, needs addref");
   if (gKeywordTree) {
@@ -128,6 +128,12 @@ nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
   return eCSSKeyword_UNKNOWN;
 }
 
+nsCSSKeyword 
+nsCSSKeywords::LookupKeyword(const nsString& aKeyword) {
+  nsCAutoString theKeyword(aKeyword);
+  return LookupKeyword(theKeyword);
+}
+
 
 const nsCString& 
 nsCSSKeywords::GetStringValue(nsCSSKeyword aKeyword)
diff --git a/mozilla/layout/html/style/src/nsCSSKeywords.h b/mozilla/layout/html/style/src/nsCSSKeywords.h
index 9f93701c849..4473a0c3bac 100644
--- a/mozilla/layout/html/style/src/nsCSSKeywords.h
+++ b/mozilla/layout/html/style/src/nsCSSKeywords.h
@@ -24,7 +24,7 @@
 
 #include "nslayout.h"
 
-struct nsStr;
+class nsString;
 class nsCString;
 
 /*
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a keyword string, return the enum value
-  static nsCSSKeyword LookupKeyword(const nsStr& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsCString& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsString& aKeyword);
 
   // Given a keyword enum, get the string value
   static const nsCString& GetStringValue(nsCSSKeyword aKeyword);
diff --git a/mozilla/layout/html/style/src/nsCSSProps.cpp b/mozilla/layout/html/style/src/nsCSSProps.cpp
index ced147a5b06..2a01f8fd124 100644
--- a/mozilla/layout/html/style/src/nsCSSProps.cpp
+++ b/mozilla/layout/html/style/src/nsCSSProps.cpp
@@ -119,7 +119,7 @@ nsCSSProps::ReleaseTable(void)
 
 
 nsCSSProperty 
-nsCSSProps::LookupProperty(const nsStr& aProperty)
+nsCSSProps::LookupProperty(const nsCString& aProperty)
 {
   NS_ASSERTION(gPropertyTree, "no lookup table, needs addref");
   if (gPropertyTree) {
@@ -134,6 +134,13 @@ nsCSSProps::LookupProperty(const nsStr& aProperty)
 }
 
 
+nsCSSProperty 
+nsCSSProps::LookupProperty(const nsString& aProperty) {
+  nsCAutoString theProp(aProperty);
+  return LookupProperty(theProp);
+}
+
+
 const nsCString& 
 nsCSSProps::GetStringValue(nsCSSProperty aProperty)
 {
diff --git a/mozilla/layout/html/style/src/nsCSSProps.h b/mozilla/layout/html/style/src/nsCSSProps.h
index a10ecf76ba5..8180f359371 100644
--- a/mozilla/layout/html/style/src/nsCSSProps.h
+++ b/mozilla/layout/html/style/src/nsCSSProps.h
@@ -24,8 +24,8 @@
 
 #include "nslayout.h"
 
-struct nsStr;
 class nsCString;
+class nsString;
 
 /*
    Declare the enum list using the magic of preprocessing
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a property string, return the enum value
-  static nsCSSProperty LookupProperty(const nsStr& aProperty);
+  static nsCSSProperty LookupProperty(const nsString& aProperty);
+  static nsCSSProperty LookupProperty(const nsCString& aProperty);
 
   // Given a property enum, get the string value
   static const nsCString& GetStringValue(nsCSSProperty aProperty);
diff --git a/mozilla/layout/style/nsCSSKeywords.cpp b/mozilla/layout/style/nsCSSKeywords.cpp
index d887d064afe..e1c02cd044e 100644
--- a/mozilla/layout/style/nsCSSKeywords.cpp
+++ b/mozilla/layout/style/nsCSSKeywords.cpp
@@ -114,7 +114,7 @@ nsCSSKeywords::ReleaseTable(void)
 
 
 nsCSSKeyword 
-nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
+nsCSSKeywords::LookupKeyword(const nsCString& aKeyword)
 {
   NS_ASSERTION(gKeywordTree, "no lookup table, needs addref");
   if (gKeywordTree) {
@@ -128,6 +128,12 @@ nsCSSKeywords::LookupKeyword(const nsStr& aKeyword)
   return eCSSKeyword_UNKNOWN;
 }
 
+nsCSSKeyword 
+nsCSSKeywords::LookupKeyword(const nsString& aKeyword) {
+  nsCAutoString theKeyword(aKeyword);
+  return LookupKeyword(theKeyword);
+}
+
 
 const nsCString& 
 nsCSSKeywords::GetStringValue(nsCSSKeyword aKeyword)
diff --git a/mozilla/layout/style/nsCSSKeywords.h b/mozilla/layout/style/nsCSSKeywords.h
index 9f93701c849..4473a0c3bac 100644
--- a/mozilla/layout/style/nsCSSKeywords.h
+++ b/mozilla/layout/style/nsCSSKeywords.h
@@ -24,7 +24,7 @@
 
 #include "nslayout.h"
 
-struct nsStr;
+class nsString;
 class nsCString;
 
 /*
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a keyword string, return the enum value
-  static nsCSSKeyword LookupKeyword(const nsStr& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsCString& aKeyword);
+  static nsCSSKeyword LookupKeyword(const nsString& aKeyword);
 
   // Given a keyword enum, get the string value
   static const nsCString& GetStringValue(nsCSSKeyword aKeyword);
diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp
index ced147a5b06..2a01f8fd124 100644
--- a/mozilla/layout/style/nsCSSProps.cpp
+++ b/mozilla/layout/style/nsCSSProps.cpp
@@ -119,7 +119,7 @@ nsCSSProps::ReleaseTable(void)
 
 
 nsCSSProperty 
-nsCSSProps::LookupProperty(const nsStr& aProperty)
+nsCSSProps::LookupProperty(const nsCString& aProperty)
 {
   NS_ASSERTION(gPropertyTree, "no lookup table, needs addref");
   if (gPropertyTree) {
@@ -134,6 +134,13 @@ nsCSSProps::LookupProperty(const nsStr& aProperty)
 }
 
 
+nsCSSProperty 
+nsCSSProps::LookupProperty(const nsString& aProperty) {
+  nsCAutoString theProp(aProperty);
+  return LookupProperty(theProp);
+}
+
+
 const nsCString& 
 nsCSSProps::GetStringValue(nsCSSProperty aProperty)
 {
diff --git a/mozilla/layout/style/nsCSSProps.h b/mozilla/layout/style/nsCSSProps.h
index a10ecf76ba5..8180f359371 100644
--- a/mozilla/layout/style/nsCSSProps.h
+++ b/mozilla/layout/style/nsCSSProps.h
@@ -24,8 +24,8 @@
 
 #include "nslayout.h"
 
-struct nsStr;
 class nsCString;
+class nsString;
 
 /*
    Declare the enum list using the magic of preprocessing
@@ -49,7 +49,8 @@ public:
   static void ReleaseTable(void);
 
   // Given a property string, return the enum value
-  static nsCSSProperty LookupProperty(const nsStr& aProperty);
+  static nsCSSProperty LookupProperty(const nsString& aProperty);
+  static nsCSSProperty LookupProperty(const nsCString& aProperty);
 
   // Given a property enum, get the string value
   static const nsCString& GetStringValue(nsCSSProperty aProperty);