diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
index 713201eaaa3..58a6394dae4 100644
--- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
 
         const nsStyleList* parentList = list;
-        if (nsnull != parentList) {
+        if (nsnull != parentContext) {
           parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
         }
 
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
 
         const nsStyleTable* parentTable = table;
-        if (nsnull != parentTable) {
+        if (nsnull != parentContext) {
           parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
         }
         nsStyleCoord  coord;
diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
index 713201eaaa3..58a6394dae4 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
 
         const nsStyleList* parentList = list;
-        if (nsnull != parentList) {
+        if (nsnull != parentContext) {
           parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
         }
 
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
 
         const nsStyleTable* parentTable = table;
-        if (nsnull != parentTable) {
+        if (nsnull != parentContext) {
           parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
         }
         nsStyleCoord  coord;
diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp
index 713201eaaa3..58a6394dae4 100644
--- a/mozilla/layout/style/nsCSSStyleRule.cpp
+++ b/mozilla/layout/style/nsCSSStyleRule.cpp
@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
 
         const nsStyleList* parentList = list;
-        if (nsnull != parentList) {
+        if (nsnull != parentContext) {
           parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
         }
 
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
         nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
 
         const nsStyleTable* parentTable = table;
-        if (nsnull != parentTable) {
+        if (nsnull != parentContext) {
           parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
         }
         nsStyleCoord  coord;