Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 105742 - paint the outline of an image after the image content. a=roc, sr=attinasi, r=alexsavulov.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@116407 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
2002-03-12 15:35:52 +00:00
parent 37aebee9b2
commit 1c08f43c69
4 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/layout/html/base/src/nsImageFrame.cpp
View File

@@ -1228,17 +1228,12 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
if (vis->IsVisibleOrCollapsed()) {
const nsStyleBorder* myBorder = (const nsStyleBorder*)
mStyleContext->GetStyleData(eStyleStruct_Border);
const nsStyleOutline* myOutline = (const nsStyleOutline*)
mStyleContext->GetStyleData(eStyleStruct_Outline);
nsRect rect(0, 0, mRect.width, mRect.height);
nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
aDirtyRect, rect, *myBorder, 0, 0);
nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
aDirtyRect, rect, *myBorder,
mStyleContext, 0);
nsCSSRendering::PaintOutline(aPresContext, aRenderingContext, this,
aDirtyRect, rect, *myBorder,
*myOutline, mStyleContext, 0);
}
}
@@ -1268,6 +1263,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
}
}
else {
PRBool paintOutline = PR_FALSE;
mInitialLoadCompleted = PR_TRUE;
if (NS_FRAME_PAINT_LAYER_FOREGROUND == aWhichLayer) {
// Now render the image into our content area (the area inside the
@@ -1330,6 +1326,7 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
aRenderingContext.DrawScaledImage(imgCon, &r, &d);
}
paintOutline = PR_TRUE;
}
}
@@ -1344,6 +1341,20 @@ nsImageFrame::Paint(nsIPresContext* aPresContext,
aRenderingContext.Translate(inner.x, inner.y);
map->Draw(aPresContext, aRenderingContext);
aRenderingContext.PopState(clipState);
paintOutline = PR_TRUE;
}
// paint the outline in the overlay layer (or if there is an image map) until the
// general problem of painting it outside the border box is solved.
if (paintOutline) {
const nsStyleBorder* myBorder = (const nsStyleBorder*)
mStyleContext->GetStyleData(eStyleStruct_Border);
const nsStyleOutline* myOutline = (const nsStyleOutline*)
mStyleContext->GetStyleData(eStyleStruct_Outline);
nsRect rect(0, 0, mRect.width, mRect.height);
nsCSSRendering::PaintOutline(aPresContext, aRenderingContext, this,
aDirtyRect, rect, *myBorder,
*myOutline, mStyleContext, 0);
}
#ifdef DEBUG