mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixing bug 104999 on windows. r=dcone sr=waterson

This commit is contained in:
pavlov%netscape.com 2002-01-30 22:17:55 +00:00
Родитель 34706cdc91
Коммит ea6da43d6c
2 изменённых файлов: 38 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
gfx/src/shared/gfxImageFrame.cpp
Просмотреть файл

@ -57,16 +57,16 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
return NS_ERROR_FAILURE;
}
mInitalized = PR_TRUE;
nsresult rv;
mOffset.MoveTo(aX, aY);
mSize.SizeTo(aWidth, aHeight);
mFormat = aFormat;
mImage = do_CreateInstance("@mozilla.org/gfx/image;1");
mImage = do_CreateInstance("@mozilla.org/gfx/image;1", &rv);
NS_ASSERTION(mImage, "creation of image failed");
if (NS_FAILED(rv)) return rv;
gfx_depth depth = 24;
nsMaskRequirements maskReq;
@ -102,11 +102,13 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
break;
}
mImage->Init(aWidth, aHeight, depth, maskReq);
rv = mImage->Init(aWidth, aHeight, depth, maskReq);
if (NS_FAILED(rv)) return rv;
mImage->SetNaturalWidth(aWidth);
mImage->SetNaturalHeight(aHeight);
mInitalized = PR_TRUE;
return NS_OK;
}
@ -114,6 +116,9 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
/* attribute boolean mutable */
NS_IMETHODIMP gfxImageFrame::GetMutable(PRBool *aMutable)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
NS_ASSERTION(mInitalized, "gfxImageFrame::GetMutable called on non-inited gfxImageFrame");
*aMutable = mMutable;
return NS_OK;
@ -121,7 +126,14 @@ NS_IMETHODIMP gfxImageFrame::GetMutable(PRBool *aMutable)
NS_IMETHODIMP gfxImageFrame::SetMutable(PRBool aMutable)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
mMutable = aMutable;
if (!aMutable)
mImage->Optimize(nsnull);
return NS_OK;
}
@ -466,6 +478,9 @@ NS_IMETHODIMP gfxImageFrame::SetTransparentColor(gfx_color aTransparentColor)
NS_IMETHODIMP gfxImageFrame::GetInterface(const nsIID & aIID, void * *result)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
NS_ENSURE_ARG_POINTER(result);
if (NS_SUCCEEDED(QueryInterface(aIID, result)))

23
gfx2/src/gfxImageFrame.cpp
Просмотреть файл

@ -57,16 +57,16 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
return NS_ERROR_FAILURE;
}
mInitalized = PR_TRUE;
nsresult rv;
mOffset.MoveTo(aX, aY);
mSize.SizeTo(aWidth, aHeight);
mFormat = aFormat;
mImage = do_CreateInstance("@mozilla.org/gfx/image;1");
mImage = do_CreateInstance("@mozilla.org/gfx/image;1", &rv);
NS_ASSERTION(mImage, "creation of image failed");
if (NS_FAILED(rv)) return rv;
gfx_depth depth = 24;
nsMaskRequirements maskReq;
@ -102,11 +102,13 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
break;
}
mImage->Init(aWidth, aHeight, depth, maskReq);
rv = mImage->Init(aWidth, aHeight, depth, maskReq);
if (NS_FAILED(rv)) return rv;
mImage->SetNaturalWidth(aWidth);
mImage->SetNaturalHeight(aHeight);
mInitalized = PR_TRUE;
return NS_OK;
}
@ -114,6 +116,9 @@ NS_IMETHODIMP gfxImageFrame::Init(nscoord aX, nscoord aY, nscoord aWidth, nscoor
/* attribute boolean mutable */
NS_IMETHODIMP gfxImageFrame::GetMutable(PRBool *aMutable)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
NS_ASSERTION(mInitalized, "gfxImageFrame::GetMutable called on non-inited gfxImageFrame");
*aMutable = mMutable;
return NS_OK;
@ -121,7 +126,14 @@ NS_IMETHODIMP gfxImageFrame::GetMutable(PRBool *aMutable)
NS_IMETHODIMP gfxImageFrame::SetMutable(PRBool aMutable)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
mMutable = aMutable;
if (!aMutable)
mImage->Optimize(nsnull);
return NS_OK;
}
@ -466,6 +478,9 @@ NS_IMETHODIMP gfxImageFrame::SetTransparentColor(gfx_color aTransparentColor)
NS_IMETHODIMP gfxImageFrame::GetInterface(const nsIID & aIID, void * *result)
{
if (!mInitalized)
return NS_ERROR_NOT_INITIALIZED;
NS_ENSURE_ARG_POINTER(result);
if (NS_SUCCEEDED(QueryInterface(aIID, result)))