From 406de8984aa0f45b5f670241127564697cc8c2b7 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Mon, 21 Dec 1998 07:48:12 +0000 Subject: [PATCH] fixed a crasher when mapping list or table style with a null parent context git-svn-id: svn://10.0.0.236/trunk@16743 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSStyleRule.cpp | 4 ++-- mozilla/layout/html/style/src/nsCSSStyleRule.cpp | 4 ++-- mozilla/layout/style/nsCSSStyleRule.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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;