Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-30 10:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to use new image loading apis

Browse Source
This commit is contained in:
kipp%netscape.com 1999-04-13 21:52:19 +00:00
parent a0b4329e22
commit a75693e1fa
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/base/nsCSSRendering.cpp
View File

@ -162,6 +162,7 @@ nscolor nsCSSRendering::MakeBevelColor(PRIntn whichSide, PRUint8 style,
theColor = colors[0];
break;
case NS_SIDE_LEFT:
default:
theColor = colors[0];
break;
}
@ -1685,16 +1686,15 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
nsIFrameImageLoader* loader = nsnull;
PRBool transparentBG = NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
nsSize loadSize(0, 0);
nsresult rv = aPresContext.StartLoadImage(aColor.mBackgroundImage,
transparentBG
? nsnull
: &aColor.mBackgroundColor,
aForFrame, loadSize,
nsnull,
PR_FALSE, PR_FALSE, &loader);
aForFrame, nsnull, nsnull,
&loader);
if ((NS_OK != rv) || (nsnull == loader) ||
(loader->GetImage(image), (nsnull == image))) {
(loader->GetImage(&image), (nsnull == image))) {
NS_IF_RELEASE(loader);
// Redraw will happen later
if (!transparentBG) {
@ -1714,11 +1714,8 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
}
#endif
// Convert image dimensions into nscoord's
float p2t;
aPresContext.GetScaledPixelsToTwips(&p2t);
nscoord tileWidth = NSIntPixelsToTwips(imageSize.width, p2t);
nscoord tileHeight = NSIntPixelsToTwips(imageSize.height, p2t);
nscoord tileWidth = imageSize.width;
nscoord tileHeight = imageSize.height;
if ((tileWidth == 0) || (tileHeight == 0)) {
return;
}

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

@ -162,6 +162,7 @@ nscolor nsCSSRendering::MakeBevelColor(PRIntn whichSide, PRUint8 style,
theColor = colors[0];
break;
case NS_SIDE_LEFT:
default:
theColor = colors[0];
break;
}
@ -1685,16 +1686,15 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
nsIFrameImageLoader* loader = nsnull;
PRBool transparentBG = NS_STYLE_BG_COLOR_TRANSPARENT ==
(aColor.mBackgroundFlags & NS_STYLE_BG_COLOR_TRANSPARENT);
nsSize loadSize(0, 0);
nsresult rv = aPresContext.StartLoadImage(aColor.mBackgroundImage,
transparentBG
? nsnull
: &aColor.mBackgroundColor,
aForFrame, loadSize,
nsnull,
PR_FALSE, PR_FALSE, &loader);
aForFrame, nsnull, nsnull,
&loader);
if ((NS_OK != rv) || (nsnull == loader) ||
(loader->GetImage(image), (nsnull == image))) {
(loader->GetImage(&image), (nsnull == image))) {
NS_IF_RELEASE(loader);
// Redraw will happen later
if (!transparentBG) {
@ -1714,11 +1714,8 @@ nsCSSRendering::PaintBackground(nsIPresContext& aPresContext,
}
#endif
// Convert image dimensions into nscoord's
float p2t;
aPresContext.GetScaledPixelsToTwips(&p2t);
nscoord tileWidth = NSIntPixelsToTwips(imageSize.width, p2t);
nscoord tileHeight = NSIntPixelsToTwips(imageSize.height, p2t);
nscoord tileWidth = imageSize.width;
nscoord tileHeight = imageSize.height;
if ((tileWidth == 0) || (tileHeight == 0)) {
return;
}