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

Bug #5677: Reenabled drawing images referenced by <OBJECT> tags, fixed a crashing bug on the Mac as a result.

Browse Source
This commit is contained in:
beard%netscape.com 1999-06-17 00:58:07 +00:00
parent d3e91bee1b
commit faf9928aef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/generic/nsObjectFrame.cpp
View File

@ -1134,7 +1134,6 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer)
{
#if !defined(XP_MAC)
nsIFrame * child = mFrames.FirstChild();
if(child != NULL) //This is an image
{
@ -1142,6 +1141,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
return NS_OK;
}
#if !defined(XP_MAC)
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer)
{
aRenderingContext.SetColor(NS_RGB(192, 192, 192));
@ -1179,7 +1179,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
}
#else
// delegate all painting to the plugin instance.
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer && nsnull != mInstanceOwner) {
mInstanceOwner->Paint(aDirtyRect);
}
#endif /* !XP_MAC */

4
layout/html/base/src/nsObjectFrame.cpp
View File

@ -1134,7 +1134,6 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
const nsRect& aDirtyRect,
nsFramePaintLayer aWhichLayer)
{
#if !defined(XP_MAC)
nsIFrame * child = mFrames.FirstChild();
if(child != NULL) //This is an image
{
@ -1142,6 +1141,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
return NS_OK;
}
#if !defined(XP_MAC)
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer)
{
aRenderingContext.SetColor(NS_RGB(192, 192, 192));
@ -1179,7 +1179,7 @@ nsObjectFrame::Paint(nsIPresContext& aPresContext,
}
#else
// delegate all painting to the plugin instance.
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer && nsnull != mInstanceOwner) {
mInstanceOwner->Paint(aDirtyRect);
}
#endif /* !XP_MAC */