Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-07 07:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix crash where we could dereference a null reference. shuffle some code around to ensure that can't happen anymore. r=ben/sr=blake/a=thesteve for smoketest blocker bug 126770

Browse Source
This commit is contained in:
pinkerton%netscape.com 2002-02-20 21:51:25 +00:00
parent 75e83bb6e4
commit ecc86da3a2
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
layout/base/nsCSSRendering.cpp
View File

@ -2563,6 +2563,8 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
content->GetParent(*getter_AddRefs(parent));
if ( parent )
return;
else
::GetStyleData(aForFrame, &color);
}
else
return;
@ -2576,6 +2578,8 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
return;
}
if (!color)
return;
nsStyleBackground canvasColor(*color);
nsCOMPtr<nsIPresShell> shell;
@ -2629,16 +2633,8 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
NS_PRECONDITION(aForFrame,
"Frame is expected to be provided to PaintBackground");
PRBool transparentBG =
NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
PRBool canDrawBackgroundImage=PR_TRUE,canDrawBackgroundColor=PR_TRUE;
float percent;
nsStyleCoord bordStyleRadius[4];
PRInt16 borderRadii[4],i;
// if we are printing, bail for now
PRBool canDrawBackgroundImage=PR_TRUE,canDrawBackgroundColor=PR_TRUE;
if(aUsePrintSettings){
aPresContext->GetBackgroundImageDraw(canDrawBackgroundImage);
aPresContext->GetBackgroundColorDraw(canDrawBackgroundColor);
@ -2649,7 +2645,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
}
}
// Check to see if we have an appearance defined. If so, we let the theme
// renderer draw the background.
// renderer draw the background and bail out.
const nsStyleDisplay* displayData;
aForFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct*&)displayData));
if (displayData->mAppearance) {
@ -2662,6 +2658,13 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
}
}
PRBool transparentBG =
NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
float percent;
nsStyleCoord bordStyleRadius[4];
PRInt16 borderRadii[4],i;
// if there is no background image or background images are turned off, try a color.
if (aColor.mBackgroundImage.IsEmpty() || (canDrawBackgroundColor && !canDrawBackgroundImage)) {
// See if there's a background color specified. The background color

23
layout/html/style/src/nsCSSRendering.cpp
View File

@ -2563,6 +2563,8 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
content->GetParent(*getter_AddRefs(parent));
if ( parent )
return;
else
::GetStyleData(aForFrame, &color);
}
else
return;
@ -2576,6 +2578,8 @@ nsCSSRendering::PaintBackground(nsIPresContext* aPresContext,
return;
}
if (!color)
return;
nsStyleBackground canvasColor(*color);
nsCOMPtr<nsIPresShell> shell;
@ -2629,16 +2633,8 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
NS_PRECONDITION(aForFrame,
"Frame is expected to be provided to PaintBackground");
PRBool transparentBG =
NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
PRBool canDrawBackgroundImage=PR_TRUE,canDrawBackgroundColor=PR_TRUE;
float percent;
nsStyleCoord bordStyleRadius[4];
PRInt16 borderRadii[4],i;
// if we are printing, bail for now
PRBool canDrawBackgroundImage=PR_TRUE,canDrawBackgroundColor=PR_TRUE;
if(aUsePrintSettings){
aPresContext->GetBackgroundImageDraw(canDrawBackgroundImage);
aPresContext->GetBackgroundColorDraw(canDrawBackgroundColor);
@ -2649,7 +2645,7 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
}
}
// Check to see if we have an appearance defined. If so, we let the theme
// renderer draw the background.
// renderer draw the background and bail out.
const nsStyleDisplay* displayData;
aForFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct*&)displayData));
if (displayData->mAppearance) {
@ -2662,6 +2658,13 @@ nsCSSRendering::PaintBackgroundWithSC(nsIPresContext* aPresContext,
}
}
PRBool transparentBG =
NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
float percent;
nsStyleCoord bordStyleRadius[4];
PRInt16 borderRadii[4],i;
// if there is no background image or background images are turned off, try a color.
if (aColor.mBackgroundImage.IsEmpty() || (canDrawBackgroundColor && !canDrawBackgroundImage)) {
// See if there's a background color specified. The background color