corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a crasher when mapping list or table style with a null parent context

Browse Source
This commit is contained in:
peterl@netscape.com
1998-12-21 07:48:12 +00:00
parent 54977abf27
commit 4e10cd595a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
const nsStyleList* parentList = list; const nsStyleList* parentList = list;
if (nsnull != parentList) { if (nsnull != parentContext) {
parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List); parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
} }
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table); nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
const nsStyleTable* parentTable = table; const nsStyleTable* parentTable = table;
if (nsnull != parentTable) { if (nsnull != parentContext) {
parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table); parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
} }
nsStyleCoord coord; nsStyleCoord coord;

4
layout/html/style/src/nsCSSStyleRule.cpp
View File

@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
const nsStyleList* parentList = list; const nsStyleList* parentList = list;
if (nsnull != parentList) { if (nsnull != parentContext) {
parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List); parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
} }
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table); nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
const nsStyleTable* parentTable = table; const nsStyleTable* parentTable = table;
if (nsnull != parentTable) { if (nsnull != parentContext) {
parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table); parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
} }
nsStyleCoord coord; nsStyleCoord coord;

4
layout/style/nsCSSStyleRule.cpp
View File

@@ -1845,7 +1845,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List); nsStyleList* list = (nsStyleList*)aContext->GetMutableStyleData(eStyleStruct_List);
const nsStyleList* parentList = list; const nsStyleList* parentList = list;
if (nsnull != parentList) { if (nsnull != parentContext) {
parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List); parentList = (const nsStyleList*)parentContext->GetStyleData(eStyleStruct_List);
} }
@@ -1887,7 +1887,7 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration,
nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table); nsStyleTable* table = (nsStyleTable*)aContext->GetMutableStyleData(eStyleStruct_Table);
const nsStyleTable* parentTable = table; const nsStyleTable* parentTable = table;
if (nsnull != parentTable) { if (nsnull != parentContext) {
parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table); parentTable = (const nsStyleTable*)parentContext->GetStyleData(eStyleStruct_Table);
} }
nsStyleCoord coord; nsStyleCoord coord;